Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6f2fe98 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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)
parents 04fc5fd3 2053ed02

drivers/net/declance.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

drivers/net/e1000/e1000_main.c

+0 −4
Original line number Diff line number Diff line
@@ -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 */

include/linux/if_ether.h

+1 −0
Original line number Diff line number Diff line
@@ -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.