git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netfilter: xt_LOG: don't use xchg() for simple assignment
[pandora-kernel.git]
/
include
/
linux
/
ipv6.h
diff --git
a/include/linux/ipv6.h
b/include/linux/ipv6.h
index
0c99776
..
00ef00d
100644
(file)
--- a/
include/linux/ipv6.h
+++ b/
include/linux/ipv6.h
@@
-255,6
+255,7
@@
struct inet6_skb_parm {
#define IP6SKB_XFRM_TRANSFORMED 1
#define IP6SKB_FORWARDED 2
#define IP6SKB_REROUTED 4
#define IP6SKB_XFRM_TRANSFORMED 1
#define IP6SKB_FORWARDED 2
#define IP6SKB_REROUTED 4
+#define IP6SKB_FRAGMENTED 16
};
#define IP6CB(skb) ((struct inet6_skb_parm*)((skb)->cb))
};
#define IP6CB(skb) ((struct inet6_skb_parm*)((skb)->cb))
@@
-368,7
+369,7
@@
struct ipv6_pinfo {
struct ipv6_ac_socklist *ipv6_ac_list;
struct ipv6_fl_socklist *ipv6_fl_list;
struct ipv6_ac_socklist *ipv6_ac_list;
struct ipv6_fl_socklist *ipv6_fl_list;
- struct ipv6_txoptions *opt;
+ struct ipv6_txoptions
__rcu
*opt;
struct sk_buff *pktoptions;
struct sk_buff *rxpmtu;
struct {
struct sk_buff *pktoptions;
struct sk_buff *rxpmtu;
struct {