Merge branch 'linus' into cont_syslog

[safe/jmp/linux-2.6] / drivers / net / s6gmac.c

diff --git a/drivers/net/s6gmac.c b/drivers/net/s6gmac.c
index d81706e..a7ff8ea 100644 (file)
--- a/drivers/net/s6gmac.c
+++ b/drivers/net/s6gmac.c
@@ -373,9 +373,9 @@ struct s6gmac {
 static void s6gmac_rx_fillfifo(struct s6gmac *pd)
 {
        struct sk_buff *skb;
-       while ((((u8)(pd->rx_skb_i - pd->rx_skb_o)) < S6_NUM_RX_SKB)
-                       && (!s6dmac_fifo_full(pd->rx_dma, pd->rx_chan))
-                       && (skb = dev_alloc_skb(S6_MAX_FRLEN + 2))) {
+       while ((((u8)(pd->rx_skb_i - pd->rx_skb_o)) < S6_NUM_RX_SKB) &&
+              (!s6dmac_fifo_full(pd->rx_dma, pd->rx_chan)) &&
+              (skb = dev_alloc_skb(S6_MAX_FRLEN + 2))) {
                pd->rx_skb[(pd->rx_skb_i++) % S6_NUM_RX_SKB] = skb;
                s6dmac_put_fifo_cache(pd->rx_dma, pd->rx_chan,
                        pd->io, (u32)skb->data, S6_MAX_FRLEN);
@@ -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 |