diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/declance.c | 2 | ||||
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/declance.c b/drivers/net/declance.c index 95d854e2295c..b2577f40124e 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c | |||
@@ -932,8 +932,6 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
932 | /* Kick the lance: transmit now */ | 932 | /* Kick the lance: transmit now */ |
933 | writereg(&ll->rdp, LE_C0_INEA | LE_C0_TDMD); | 933 | writereg(&ll->rdp, LE_C0_INEA | LE_C0_TDMD); |
934 | 934 | ||
935 | spin_unlock_irq(&lp->lock); | ||
936 | |||
937 | dev->trans_start = jiffies; | 935 | dev->trans_start = jiffies; |
938 | dev_kfree_skb(skb); | 936 | dev_kfree_skb(skb); |
939 | 937 | ||
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 49be393e1c1d..cbc7febe9cdc 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -1431,10 +1431,6 @@ e1000_open(struct net_device *netdev) | |||
1431 | /* From here on the code is the same as e1000_up() */ | 1431 | /* From here on the code is the same as e1000_up() */ |
1432 | clear_bit(__E1000_DOWN, &adapter->flags); | 1432 | clear_bit(__E1000_DOWN, &adapter->flags); |
1433 | 1433 | ||
1434 | #ifdef CONFIG_E1000_NAPI | ||
1435 | netif_poll_enable(netdev); | ||
1436 | #endif | ||
1437 | |||
1438 | e1000_irq_enable(adapter); | 1434 | e1000_irq_enable(adapter); |
1439 | 1435 | ||
1440 | /* fire a link status change interrupt to start the watchdog */ | 1436 | /* fire a link status change interrupt to start the watchdog */ |