Merge branch 'master'

This commit is contained in:
Jeff Garzik 2005-11-05 15:39:24 -05:00
commit 7211bb9b64
3399 changed files with 226882 additions and 147463 deletions

View file

@ -308,6 +308,7 @@ struct net_device
#define NETIF_F_VLAN_CHALLENGED 1024 /* Device cannot handle VLAN packets */
#define NETIF_F_TSO 2048 /* Can offload TCP/IP segmentation */
#define NETIF_F_LLTX 4096 /* LockLess TX */
#define NETIF_F_UFO 8192 /* Can offload UDP Large Send*/
struct net_device *next_sched;