diff options
Diffstat (limited to 'drivers/net/ethernet/hisilicon')
| -rw-r--r-- | drivers/net/ethernet/hisilicon/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hip04_eth.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/hisilicon/Kconfig b/drivers/net/ethernet/hisilicon/Kconfig index a54d89791311..dead17b5d769 100644 --- a/drivers/net/ethernet/hisilicon/Kconfig +++ b/drivers/net/ethernet/hisilicon/Kconfig | |||
| @@ -7,9 +7,7 @@ config NET_VENDOR_HISILICON | |||
| 7 | default y | 7 | default y |
| 8 | depends on ARM | 8 | depends on ARM |
| 9 | ---help--- | 9 | ---help--- |
| 10 | If you have a network (Ethernet) card belonging to this class, say Y | 10 | If you have a network (Ethernet) card belonging to this class, say Y. |
| 11 | and read the Ethernet-HOWTO, available from | ||
| 12 | <http://www.tldp.org/docs.html#howto>. | ||
| 13 | 11 | ||
| 14 | Note that the answer to this question doesn't directly affect the | 12 | Note that the answer to this question doesn't directly affect the |
| 15 | kernel: saying N will just cause the configurator to skip all | 13 | kernel: saying N will just cause the configurator to skip all |
diff --git a/drivers/net/ethernet/hisilicon/hip04_eth.c b/drivers/net/ethernet/hisilicon/hip04_eth.c index 3b39fdddeb57..d49bee38cd31 100644 --- 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) | |||
| 798 | 798 | ||
| 799 | for (i = 0; i < RX_DESC_NUM; i++) | 799 | for (i = 0; i < RX_DESC_NUM; i++) |
| 800 | if (priv->rx_buf[i]) | 800 | if (priv->rx_buf[i]) |
| 801 | put_page(virt_to_head_page(priv->rx_buf[i])); | 801 | skb_free_frag(priv->rx_buf[i]); |
| 802 | 802 | ||
| 803 | for (i = 0; i < TX_DESC_NUM; i++) | 803 | for (i = 0; i < TX_DESC_NUM; i++) |
| 804 | if (priv->tx_skb[i]) | 804 | if (priv->tx_skb[i]) |
diff --git a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c index 0ffdcd381fdd..a5e077eac99a 100644 --- a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c +++ b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | |||
| @@ -500,7 +500,6 @@ static int hix5hd2_rx(struct net_device *dev, int limit) | |||
| 500 | napi_gro_receive(&priv->napi, skb); | 500 | napi_gro_receive(&priv->napi, skb); |
| 501 | dev->stats.rx_packets++; | 501 | dev->stats.rx_packets++; |
| 502 | dev->stats.rx_bytes += skb->len; | 502 | dev->stats.rx_bytes += skb->len; |
| 503 | dev->last_rx = jiffies; | ||
| 504 | next: | 503 | next: |
| 505 | pos = dma_ring_incr(pos, RX_DESC_NUM); | 504 | pos = dma_ring_incr(pos, RX_DESC_NUM); |
| 506 | } | 505 | } |
