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

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

diff --git a/kernel/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c b/kernel/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
index 0ffdcd3..e51892d 100644 (file)
--- a/kernel/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
+++ b/kernel/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
@@ -371,7 +371,7 @@ static void hix5hd2_port_enable(struct hix5hd2_priv *priv)
 
 static void hix5hd2_port_disable(struct hix5hd2_priv *priv)
 {
-       writel_relaxed(~(BITS_RX_EN | BITS_TX_EN), priv->base + PORT_EN);
+       writel_relaxed(~(u32)(BITS_RX_EN | BITS_TX_EN), priv->base + PORT_EN);
        writel_relaxed(0, priv->base + DESC_WR_RD_ENA);
 }
 
@@ -500,7 +500,6 @@ static int hix5hd2_rx(struct net_device *dev, int limit)
                napi_gro_receive(&priv->napi, skb);
                dev->stats.rx_packets++;
                dev->stats.rx_bytes += skb->len;
-               dev->last_rx = jiffies;
 next:
                pos = dma_ring_incr(pos, RX_DESC_NUM);
        }