Skip to content

Commit e90c148

Browse files
strssndktndavem330
authored andcommitted
inet: remove now unused flag DST_NOPEER
Commit e688a60 ("net: introduce DST_NOPEER dst flag") introduced DST_NOPEER because because of crashes in ipv6_select_ident called from udp6_ufo_fragment. Since commit 916e4cf ("ipv6: reuse ip6_frag_id from ip6_ufo_append_data") we don't call ipv6_select_ident any more from ip6_ufo_append_data, thus this flag lost its purpose and can be removed. Cc: Eric Dumazet <[email protected]> Signed-off-by: Hannes Frederic Sowa <[email protected]> Acked-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent e08f53f commit e90c148

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

include/net/dst.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,9 @@ struct dst_entry {
5454
#define DST_NOHASH 0x0008
5555
#define DST_NOCACHE 0x0010
5656
#define DST_NOCOUNT 0x0020
57-
#define DST_NOPEER 0x0040
58-
#define DST_FAKE_RTABLE 0x0080
59-
#define DST_XFRM_TUNNEL 0x0100
60-
#define DST_XFRM_QUEUE 0x0200
57+
#define DST_FAKE_RTABLE 0x0040
58+
#define DST_XFRM_TUNNEL 0x0080
59+
#define DST_XFRM_QUEUE 0x0100
6160

6261
unsigned short pending_confirm;
6362

net/bridge/br_netfilter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ void br_netfilter_rtable_init(struct net_bridge *br)
167167
rt->dst.dev = br->dev;
168168
rt->dst.path = &rt->dst;
169169
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;
171171
rt->dst.ops = &fake_dst_ops;
172172
}
173173

net/ipv6/output_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
1313
int old, new;
1414

1515
#if IS_ENABLED(CONFIG_IPV6)
16-
if (rt && !(rt->dst.flags & DST_NOPEER)) {
16+
if (rt) {
1717
struct inet_peer *peer;
1818
struct net *net;
1919

0 commit comments

Comments
 (0)