- patches.arch/x86_mce_intel_decode_physical_address.patch:

[linux-flexiantxendom0-3.2.10.git] / drivers / net / s6gmac.c

diff --git a/drivers/net/s6gmac.c b/drivers/net/s6gmac.c
index 45f2634..a7ff8ea 100644 (file)
--- a/drivers/net/s6gmac.c
+++ b/drivers/net/s6gmac.c
@@ -396,7 +396,6 @@ static void s6gmac_rx_interrupt(struct net_device *dev)
                } else {
                        skb_put(skb, (pfx >> S6_GMAC_BURST_POSTRD_LEN)
                                & S6_GMAC_BURST_POSTRD_LEN_MASK);
-                       skb->dev = dev;
                        skb->protocol = eth_type_trans(skb, dev);
                        skb->ip_summed = CHECKSUM_UNNECESSARY;
                        netif_rx(skb);
@@ -853,8 +852,8 @@ static int s6gmac_tx(struct sk_buff *skb, struct net_device *dev)
 {
        struct s6gmac *pd = netdev_priv(dev);
        unsigned long flags;
+
        spin_lock_irqsave(&pd->lock, flags);
-       dev->trans_start = jiffies;
        writel(skb->len << S6_GMAC_BURST_PREWR_LEN |
                0 << S6_GMAC_BURST_PREWR_CFE |
                1 << S6_GMAC_BURST_PREWR_PPE |