projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-serial
[powerpc.git]
/
net
/
ipv6
/
ip6_output.c
diff --git
a/net/ipv6/ip6_output.c
b/net/ipv6/ip6_output.c
index
e460489
..
d29620f
100644
(file)
--- a/
net/ipv6/ip6_output.c
+++ b/
net/ipv6/ip6_output.c
@@
-39,6
+39,7
@@
#include <linux/in6.h>
#include <linux/tcp.h>
#include <linux/route.h>
#include <linux/in6.h>
#include <linux/tcp.h>
#include <linux/route.h>
+#include <linux/module.h>
#include <linux/netfilter.h>
#include <linux/netfilter_ipv6.h>
#include <linux/netfilter.h>
#include <linux/netfilter_ipv6.h>
@@
-458,6
+459,7
@@
static void ip6_copy_metadata(struct sk_buff *to, struct sk_buff *from)
nf_bridge_get(to->nf_bridge);
#endif
#endif
nf_bridge_get(to->nf_bridge);
#endif
#endif
+ skb_copy_secmark(to, from);
}
int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr)
}
int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr)
@@
-488,6
+490,7
@@
int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr)
return offset;
}
return offset;
}
+EXPORT_SYMBOL_GPL(ip6_find_1stfragopt);
static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
{
static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
{