projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus' of git://github.com/openrisc/linux
[linux-2.6-microblaze.git]
/
net
/
ipv6
/
netfilter
/
nf_reject_ipv6.c
diff --git
a/net/ipv6/netfilter/nf_reject_ipv6.c
b/net/ipv6/netfilter/nf_reject_ipv6.c
index
570d1d7
..
dffeaaa
100644
(file)
--- a/
net/ipv6/netfilter/nf_reject_ipv6.c
+++ b/
net/ipv6/netfilter/nf_reject_ipv6.c
@@
-314,7
+314,7
@@
void nf_send_reset6(struct net *net, struct sock *sk, struct sk_buff *oldskb,
fl6.flowi6_oif = l3mdev_master_ifindex(skb_dst(oldskb)->dev);
fl6.flowi6_mark = IP6_REPLY_MARK(net, oldskb->mark);
fl6.flowi6_oif = l3mdev_master_ifindex(skb_dst(oldskb)->dev);
fl6.flowi6_mark = IP6_REPLY_MARK(net, oldskb->mark);
- security_skb_classify_flow(oldskb, flowi6_to_flowi(&fl6));
+ security_skb_classify_flow(oldskb, flowi6_to_flowi
_common
(&fl6));
dst = ip6_route_output(net, NULL, &fl6);
if (dst->error) {
dst_release(dst);
dst = ip6_route_output(net, NULL, &fl6);
if (dst->error) {
dst_release(dst);