diff options
Diffstat (limited to 'drivers/net/s6gmac.c')
-rw-r--r-- | drivers/net/s6gmac.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/s6gmac.c b/drivers/net/s6gmac.c index 45f26344b368..a7ff8ea342b4 100644 --- a/drivers/net/s6gmac.c +++ b/drivers/net/s6gmac.c | |||
@@ -396,7 +396,6 @@ static void s6gmac_rx_interrupt(struct net_device *dev) | |||
396 | } else { | 396 | } else { |
397 | skb_put(skb, (pfx >> S6_GMAC_BURST_POSTRD_LEN) | 397 | skb_put(skb, (pfx >> S6_GMAC_BURST_POSTRD_LEN) |
398 | & S6_GMAC_BURST_POSTRD_LEN_MASK); | 398 | & S6_GMAC_BURST_POSTRD_LEN_MASK); |
399 | skb->dev = dev; | ||
400 | skb->protocol = eth_type_trans(skb, dev); | 399 | skb->protocol = eth_type_trans(skb, dev); |
401 | skb->ip_summed = CHECKSUM_UNNECESSARY; | 400 | skb->ip_summed = CHECKSUM_UNNECESSARY; |
402 | netif_rx(skb); | 401 | netif_rx(skb); |
@@ -853,8 +852,8 @@ static int s6gmac_tx(struct sk_buff *skb, struct net_device *dev) | |||
853 | { | 852 | { |
854 | struct s6gmac *pd = netdev_priv(dev); | 853 | struct s6gmac *pd = netdev_priv(dev); |
855 | unsigned long flags; | 854 | unsigned long flags; |
855 | |||
856 | spin_lock_irqsave(&pd->lock, flags); | 856 | spin_lock_irqsave(&pd->lock, flags); |
857 | dev->trans_start = jiffies; | ||
858 | writel(skb->len << S6_GMAC_BURST_PREWR_LEN | | 857 | writel(skb->len << S6_GMAC_BURST_PREWR_LEN | |
859 | 0 << S6_GMAC_BURST_PREWR_CFE | | 858 | 0 << S6_GMAC_BURST_PREWR_CFE | |
860 | 1 << S6_GMAC_BURST_PREWR_PPE | | 859 | 1 << S6_GMAC_BURST_PREWR_PPE | |