Merge commit 'origin/master' into next

[pandora-kernel.git] / drivers / net / pcnet32.c

diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index 80124fa..1c35e1d 100644 (file)
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -1227,7 +1227,6 @@ static void pcnet32_rx_entry(struct net_device *dev,
                dev->stats.rx_dropped++;
                return;
        }
-       skb->dev = dev;
        if (!rx_in_place) {
                skb_reserve(skb, NET_IP_ALIGN);
                skb_put(skb, pkt_len);  /* Make room */
@@ -1406,7 +1405,7 @@ static int pcnet32_poll(struct napi_struct *napi, int budget)
 
                /* Set interrupt enable. */
                lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN);
-               mmiowb();
+
                spin_unlock_irqrestore(&lp->lock, flags);
        }
        return work_done;
@@ -2598,7 +2597,7 @@ pcnet32_interrupt(int irq, void *dev_id)
                        val = lp->a.read_csr(ioaddr, CSR3);
                        val |= 0x5f00;
                        lp->a.write_csr(ioaddr, CSR3, val);
-                       mmiowb();
+
                        __napi_schedule(&lp->napi);
                        break;
                }