aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-21 17:45:25 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-21 17:45:25 -0700
commitd6f2fe98ebc2dd8f3e9926673e0d8acd2c764e71 (patch)
tree009356baa16941facc8df7e057b78c0397093013 /drivers
parent04fc5fd39e09c460fd478ea84b34c445dd376759 (diff)
parent2053ed02a62f2c66d9cb9b51aea0836a7d8dbabf (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: Add constant for FCS/CRC length (frame check sequence) declance: Remove a dangling spin_unlock_irq() thingy e1000: Don't enable polling in open() (was: e1000: assertion hit in e1000_clean(), kernel 2.6.21.1)
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/declance.c2
-rw-r--r--drivers/net/e1000/e1000_main.c4
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/declance.c b/drivers/net/declance.c
index 95d854e2295..b2577f40124 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)
/* Kick the lance: transmit now */
writereg(&ll->rdp, LE_C0_INEA | LE_C0_TDMD);
- spin_unlock_irq(&lp->lock);
-
dev->trans_start = jiffies;
dev_kfree_skb(skb);
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 49be393e1c1..cbc7febe9cd 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)
/* From here on the code is the same as e1000_up() */
clear_bit(__E1000_DOWN, &adapter->flags);
-#ifdef CONFIG_E1000_NAPI
- netif_poll_enable(netdev);
-#endif
-
e1000_irq_enable(adapter);
/* fire a link status change interrupt to start the watchdog */