projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[NET]: Rethink mark field in struct flowi
[deliverable/linux.git]
/
net
/
ipv6
/
route.c
diff --git
a/net/ipv6/route.c
b/net/ipv6/route.c
index aaabb1fad1cf84d838a915c5fa9d80c8fee92873..e3eab1529633a60b92176d5c05977cdc8958ffc7 100644
(file)
--- a/
net/ipv6/route.c
+++ b/
net/ipv6/route.c
@@
-711,12
+711,10
@@
void ip6_route_input(struct sk_buff *skb)
.ip6_u = {
.daddr = iph->daddr,
.saddr = iph->saddr,
-#ifdef CONFIG_IPV6_ROUTE_FWMARK
- .fwmark = skb->mark,
-#endif
.flowlabel = (* (__be32 *) iph)&IPV6_FLOWINFO_MASK,
},
},
+ .mark = skb->mark,
.proto = iph->nexthdr,
};
This page took
0.026554 seconds
and
5
git commands to generate.