V4L/DVB (5967): ivtv: fix VIDIOC_S_FBUF:new OSD values where never set

[linux-2.6-omap-h63xx.git] / drivers / net / znet.c

diff --git a/drivers/net/znet.c b/drivers/net/znet.c
index 2068a109a86ce8b29d4453c869e7f60479f80017..4032e9f6f9b072f4c0f26acbd1d92fb8b3e1c13b 100644 (file)
--- a/drivers/net/znet.c
+++ b/drivers/net/znet.c
@@ -610,11 +610,6 @@ static irqreturn_t znet_interrupt(int irq, void *dev_id)
        int boguscnt = 20;
        int handled = 0;
 
-       if (dev == NULL) {
-               printk(KERN_WARNING "znet_interrupt(): IRQ %d for unknown device.\n", irq);
-               return IRQ_NONE;
-       }
-
        spin_lock (&znet->lock);
 
        ioaddr = dev->base_addr;
@@ -779,7 +774,6 @@ static void znet_rx(struct net_device *dev)
                                znet->stats.rx_dropped++;
                                break;
                        }
-                       skb->dev = dev;
 
                        if (&znet->rx_cur[(pkt_len+1)>>1] > znet->rx_end) {
                                int semi_cnt = (znet->rx_end - znet->rx_cur)<<1;