Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-03-29 01:40:34 -07:00
parent 1383bdb98c 07d43ba986
commit 13223cb02c
1572 changed files with 97858 additions and 38146 deletions
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -237,6 +237,8 @@ enum {
 	SKB_GSO_TCP_ECN = 1 << 3,

 	SKB_GSO_TCPV6 = 1 << 4,
+
+	SKB_GSO_FCOE = 1 << 5,
 };

 #if BITS_PER_LONG > 32