git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ethernet
/
hisilicon
/
hip04_eth.c
diff --git
a/drivers/net/ethernet/hisilicon/hip04_eth.c
b/drivers/net/ethernet/hisilicon/hip04_eth.c
index 3b39fdddeb57140c2d00003a0c473a869f768252..d49bee38cd319a0a8c7afd2cad7f1cb1ac7f2ed3 100644
(file)
--- a/
drivers/net/ethernet/hisilicon/hip04_eth.c
+++ b/
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])