From: David S. Miller <davem@davemloft.net>
Date: Sun, 29 Mar 2009 08:40:34 +0000 (-0700)
Subject: Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=13223cb02ccfa375f2d683d08d30db5b72264f1e;hp=-c;p=linux-2.6-omap-h63xx.git

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

13223cb02ccfa375f2d683d08d30db5b72264f1e
diff --combined include/linux/skbuff.h
index eb2e837afaf,55d67300fa1..5fd389162f0
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@@ -168,7 -168,6 +168,7 @@@ struct skb_shared_hwtstamps 
   * @software:		generate software time stamp
   * @in_progress:	device driver is going to provide
   *			hardware time stamp
 + * @flags:		all shared_tx flags
   *
   * These flags are attached to packets as part of the
   * &skb_shared_info. Use skb_tx() to get a pointer.
@@@ -237,6 -236,8 +237,8 @@@ enum 
  	SKB_GSO_TCP_ECN = 1 << 3,
  
  	SKB_GSO_TCPV6 = 1 << 4,
+ 
+ 	SKB_GSO_FCOE = 1 << 5,
  };
  
  #if BITS_PER_LONG > 32