diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 20:45:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 20:45:25 -0400 |
| commit | d6f2fe98ebc2dd8f3e9926673e0d8acd2c764e71 (patch) | |
| tree | 009356baa16941facc8df7e057b78c0397093013 /drivers/net/declance.c | |
| parent | 04fc5fd39e09c460fd478ea84b34c445dd376759 (diff) | |
| parent | 2053ed02a62f2c66d9cb9b51aea0836a7d8dbabf (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/net/declance.c')
| -rw-r--r-- | drivers/net/declance.c | 2 |
1 files changed, 0 insertions, 2 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 | ||