diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-04 00:27:42 -0500 |
commit | 0a0e9ae1bd788bc19adc4d4ae08c98b233697402 (patch) | |
tree | 13825eeb5bbeae27d66e95f12168eff4b60701ab /include/net | |
parent | 01a16b21d6adf992aa863186c3c4e561a57c1714 (diff) | |
parent | b65a0e0c84cf489bfa00d6aa6c48abc5a237100f (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/ipv6.h | 12 | ||||
-rw-r--r-- | include/net/sch_generic.h | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index d6d077d7f2c..4635a5c8096 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
@@ -89,6 +89,18 @@ | |||
89 | #define IPV6_ADDR_SCOPE_GLOBAL 0x0e | 89 | #define IPV6_ADDR_SCOPE_GLOBAL 0x0e |
90 | 90 | ||
91 | /* | 91 | /* |
92 | * Addr flags | ||
93 | */ | ||
94 | #ifdef __KERNEL__ | ||
95 | #define IPV6_ADDR_MC_FLAG_TRANSIENT(a) \ | ||
96 | ((a)->s6_addr[1] & 0x10) | ||
97 | #define IPV6_ADDR_MC_FLAG_PREFIX(a) \ | ||
98 | ((a)->s6_addr[1] & 0x20) | ||
99 | #define IPV6_ADDR_MC_FLAG_RENDEZVOUS(a) \ | ||
100 | ((a)->s6_addr[1] & 0x40) | ||
101 | #endif | ||
102 | |||
103 | /* | ||
92 | * fragmentation header | 104 | * fragmentation header |
93 | */ | 105 | */ |
94 | 106 | ||
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 1934634f889..a9505b6a18e 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h | |||
@@ -219,7 +219,7 @@ struct tcf_proto { | |||
219 | 219 | ||
220 | struct qdisc_skb_cb { | 220 | struct qdisc_skb_cb { |
221 | unsigned int pkt_len; | 221 | unsigned int pkt_len; |
222 | char data[]; | 222 | long data[]; |
223 | }; | 223 | }; |
224 | 224 | ||
225 | static inline int qdisc_qlen(struct Qdisc *q) | 225 | static inline int qdisc_qlen(struct Qdisc *q) |