diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-07-02 13:05:10 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-07-02 13:05:10 +0900 |
commit | 12462d77ec78be9fb033580b7b64ddf9d0fee44b (patch) | |
tree | a21157428d46259ed2c8a727ac12a2e658d8181a /include/linux/skbuff.h | |
parent | 598ee698d9db7beb06e12f4ea9d9a5fbc03a3a77 (diff) | |
parent | 97e0214044d9f279a3d6286c9f859696ef0b7ebe (diff) | |
download | blackbird-op-linux-12462d77ec78be9fb033580b7b64ddf9d0fee44b.tar.gz blackbird-op-linux-12462d77ec78be9fb033580b7b64ddf9d0fee44b.zip |
Merge branches 'sh/highmem' and 'sh/stable-updates'
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 bf243fc54959..f89e7fd59a4c 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); |