These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / ethernet / hisilicon / hip04_eth.c

diff --git a/kernel/drivers/net/ethernet/hisilicon/hip04_eth.c b/kernel/drivers/net/ethernet/hisilicon/hip04_eth.c
index 3b39fdd..253f8ed 100644 (file)
--- a/kernel/drivers/net/ethernet/hisilicon/hip04_eth.c
+++ b/kernel/drivers/net/ethernet/hisilicon/hip04_eth.c
@@ -798,7 +798,7 @@ static void hip04_free_ring(struct net_device *ndev, struct device *d)
 
        for (i = 0; i < RX_DESC_NUM; i++)
                if (priv->rx_buf[i])
-                       put_page(virt_to_head_page(priv->rx_buf[i]));
+                       skb_free_frag(priv->rx_buf[i]);
 
        for (i = 0; i < TX_DESC_NUM; i++)
                if (priv->tx_skb[i])
@@ -816,7 +816,7 @@ static int hip04_mac_probe(struct platform_device *pdev)
        struct net_device *ndev;
        struct hip04_priv *priv;
        struct resource *res;
-       unsigned int irq;
+       int irq;
        int ret;
 
        ndev = alloc_etherdev(sizeof(struct hip04_priv));
@@ -965,7 +965,6 @@ static struct platform_driver hip04_mac_driver = {
        .remove = hip04_remove,
        .driver = {
                .name           = DRV_NAME,
-               .owner          = THIS_MODULE,
                .of_match_table = hip04_mac_match,
        },
 };