diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-29 04:40:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-29 04:40:34 -0400 |
| commit | 13223cb02ccfa375f2d683d08d30db5b72264f1e (patch) | |
| tree | d3fc7d803d22bbfe03b96cf0ba38041d42c8a1c2 /include/linux/skbuff.h | |
| parent | 1383bdb98c01bbd28d72336d1bf614ce79114d29 (diff) | |
| parent | 07d43ba98621f08e252a48c96b258b4d572b0257 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index eb2e837afaf3..5fd389162f01 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
| @@ -237,6 +237,8 @@ enum { | |||
| 237 | SKB_GSO_TCP_ECN = 1 << 3, | 237 | SKB_GSO_TCP_ECN = 1 << 3, |
| 238 | 238 | ||
| 239 | SKB_GSO_TCPV6 = 1 << 4, | 239 | SKB_GSO_TCPV6 = 1 << 4, |
| 240 | |||
| 241 | SKB_GSO_FCOE = 1 << 5, | ||
| 240 | }; | 242 | }; |
| 241 | 243 | ||
| 242 | #if BITS_PER_LONG > 32 | 244 | #if BITS_PER_LONG > 32 |