diff options
-rw-r--r-- | include/net/dst.h | 7 | ||||
-rw-r--r-- | net/bridge/br_netfilter.c | 2 | ||||
-rw-r--r-- | net/ipv6/output_core.c | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/include/net/dst.h b/include/net/dst.h index 77eb53fabfb0..e01a826f2a9c 100644 --- a/include/net/dst.h +++ b/include/net/dst.h | |||
@@ -54,10 +54,9 @@ struct dst_entry { | |||
54 | #define DST_NOHASH 0x0008 | 54 | #define DST_NOHASH 0x0008 |
55 | #define DST_NOCACHE 0x0010 | 55 | #define DST_NOCACHE 0x0010 |
56 | #define DST_NOCOUNT 0x0020 | 56 | #define DST_NOCOUNT 0x0020 |
57 | #define DST_NOPEER 0x0040 | 57 | #define DST_FAKE_RTABLE 0x0040 |
58 | #define DST_FAKE_RTABLE 0x0080 | 58 | #define DST_XFRM_TUNNEL 0x0080 |
59 | #define DST_XFRM_TUNNEL 0x0100 | 59 | #define DST_XFRM_QUEUE 0x0100 |
60 | #define DST_XFRM_QUEUE 0x0200 | ||
61 | 60 | ||
62 | unsigned short pending_confirm; | 61 | unsigned short pending_confirm; |
63 | 62 | ||
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index df0f114fb8cb..80e1b0f60a30 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c | |||
@@ -167,7 +167,7 @@ void br_netfilter_rtable_init(struct net_bridge *br) | |||
167 | rt->dst.dev = br->dev; | 167 | rt->dst.dev = br->dev; |
168 | rt->dst.path = &rt->dst; | 168 | rt->dst.path = &rt->dst; |
169 | dst_init_metrics(&rt->dst, br_dst_default_metrics, true); | 169 | dst_init_metrics(&rt->dst, br_dst_default_metrics, true); |
170 | rt->dst.flags = DST_NOXFRM | DST_NOPEER | DST_FAKE_RTABLE; | 170 | rt->dst.flags = DST_NOXFRM | DST_FAKE_RTABLE; |
171 | rt->dst.ops = &fake_dst_ops; | 171 | rt->dst.ops = &fake_dst_ops; |
172 | } | 172 | } |
173 | 173 | ||
diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c index 827f795209cf..d1b35d377e62 100644 --- a/net/ipv6/output_core.c +++ b/net/ipv6/output_core.c | |||
@@ -13,7 +13,7 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt) | |||
13 | int old, new; | 13 | int old, new; |
14 | 14 | ||
15 | #if IS_ENABLED(CONFIG_IPV6) | 15 | #if IS_ENABLED(CONFIG_IPV6) |
16 | if (rt && !(rt->dst.flags & DST_NOPEER)) { | 16 | if (rt) { |
17 | struct inet_peer *peer; | 17 | struct inet_peer *peer; |
18 | struct net *net; | 18 | struct net *net; |
19 | 19 | ||