lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ipv4: Remove all RTCF_DIRECTSRC handliing.

Browse Source 
The last and final kernel user, ICMP address replies,
has been removed.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2012-07-23 13:22:20 -07:00
parent 838942a594
commit fe3edf4579
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
net/ipv4/route.c
View File

@@ -1391,9 +1391,6 @@ static int __mkroute_input(struct sk_buff *skb,
goto cleanup; goto cleanup;
} }
if (err)
flags |= RTCF_DIRECTSRC;
if (out_dev == in_dev && err && if (out_dev == in_dev && err &&
(IN_DEV_SHARED_MEDIA(out_dev) || (IN_DEV_SHARED_MEDIA(out_dev) ||
inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res)))) inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res))))
@@ -1416,7 +1413,7 @@ static int __mkroute_input(struct sk_buff *skb,
do_cache = false; do_cache = false;
if (res->fi) { if (res->fi) {
if (!(flags & RTCF_DIRECTSRC) && !itag) { if (!itag) {
rth = FIB_RES_NH(*res).nh_rth_input; rth = FIB_RES_NH(*res).nh_rth_input;
if (rt_cache_valid(rth)) { if (rt_cache_valid(rth)) {
dst_hold(&rth->dst); dst_hold(&rth->dst);
@@ -1558,8 +1555,6 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
dev, in_dev, &itag); dev, in_dev, &itag);
if (err < 0) if (err < 0)
goto martian_source_keep_err; goto martian_source_keep_err;
if (err)
flags |= RTCF_DIRECTSRC;
goto local_input; goto local_input;
} }
@@ -1580,8 +1575,6 @@ brd_input:
in_dev, &itag); in_dev, &itag);
if (err < 0) if (err < 0)
goto martian_source_keep_err; goto martian_source_keep_err;
if (err)
flags |= RTCF_DIRECTSRC;
} }
flags |= RTCF_BROADCAST; flags |= RTCF_BROADCAST;
res.type = RTN_BROADCAST; res.type = RTN_BROADCAST;
@@ -1590,7 +1583,7 @@ brd_input:
local_input: local_input:
do_cache = false; do_cache = false;
if (res.fi) { if (res.fi) {
if (!(flags & RTCF_DIRECTSRC) && !itag) { if (!itag) {
rth = FIB_RES_NH(res).nh_rth_input; rth = FIB_RES_NH(res).nh_rth_input;
if (rt_cache_valid(rth)) { if (rt_cache_valid(rth)) {
dst_hold(&rth->dst); dst_hold(&rth->dst);