diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 17:45:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 17:45:25 -0700 |
| commit | d6f2fe98ebc2dd8f3e9926673e0d8acd2c764e71 (patch) | |
| tree | 009356baa16941facc8df7e057b78c0397093013 | |
| parent | 04fc5fd39e09c460fd478ea84b34c445dd376759 (diff) | |
| parent | 2053ed02a62f2c66d9cb9b51aea0836a7d8dbabf (diff) | |
| download | op-kernel-dev-d6f2fe98ebc2dd8f3e9926673e0d8acd2c764e71.zip op-kernel-dev-d6f2fe98ebc2dd8f3e9926673e0d8acd2c764e71.tar.gz | |
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)
| -rw-r--r-- | drivers/net/declance.c | 2 | ||||
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 4 | ||||
| -rw-r--r-- | include/linux/if_ether.h | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/declance.c b/drivers/net/declance.c index 95d854e..b2577f4 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 49be393..cbc7feb 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 */ diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index 1db774c..3213f6f 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h @@ -33,6 +33,7 @@ #define ETH_ZLEN 60 /* Min. octets in frame sans FCS */ #define ETH_DATA_LEN 1500 /* Max. octets in payload */ #define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */ +#define ETH_FCS_LEN 4 /* Octets in the FCS */ /* * These are the defined Ethernet Protocol ID's. |
