diff options
author | David S. Miller <davem@davemloft.net> | 2010-06-11 13:32:31 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-11 13:32:31 -0700 |
commit | 62522d36d74a843e78d17f2dffc90468c6762803 (patch) | |
tree | d9d21de6724425c1b0ba12991e0865556aeda6b4 /include/linux/skbuff.h | |
parent | ethoc: use devres resource management (diff) | |
parent | Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax (diff) | |
download | linux-dev-62522d36d74a843e78d17f2dffc90468c6762803.tar.xz linux-dev-62522d36d74a843e78d17f2dffc90468c6762803.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux/skbuff.h')
-rw-r--r-- | include/linux/skbuff.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 645e78d395fd..122d08396e56 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -380,7 +380,10 @@ struct sk_buff { kmemcheck_bitfield_begin(flags2); __u16 queue_mapping:16; #ifdef CONFIG_IPV6_NDISC_NODETYPE - __u8 ndisc_nodetype:2; + __u8 ndisc_nodetype:2, + deliver_no_wcard:1; +#else + __u8 deliver_no_wcard:1; #endif kmemcheck_bitfield_end(flags2); |