Commit 51b77cae authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

route: Mark unused route cache flags as such. 



Also removes an obsolete check for the unused flag RTCF_MASQ.

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7557af25

include/linux/in_route.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -10,19 +10,19 @@ 
#define RTCF_NOPMTUDISC RTM_F_NOPMTUDISC

#define RTCF_NOPMTUDISC RTM_F_NOPMTUDISC





#define RTCF_NOTIFY	0x00010000

#define RTCF_NOTIFY	0x00010000

#define RTCF_DIRECTDST	0x00020000

#define RTCF_DIRECTDST	0x00020000 /* unused */

#define RTCF_REDIRECTED	0x00040000

#define RTCF_REDIRECTED	0x00040000

#define RTCF_TPROXY	0x00080000

#define RTCF_TPROXY	0x00080000 /* unused */





#define RTCF_FAST	0x00200000

#define RTCF_FAST	0x00200000 /* unused */

#define RTCF_MASQ	0x00400000

#define RTCF_MASQ	0x00400000 /* unused */

#define RTCF_SNAT	0x00800000

#define RTCF_SNAT	0x00800000 /* unused */

#define RTCF_DOREDIRECT 0x01000000

#define RTCF_DOREDIRECT 0x01000000

#define RTCF_DIRECTSRC	0x04000000

#define RTCF_DIRECTSRC	0x04000000

#define RTCF_DNAT	0x08000000

#define RTCF_DNAT	0x08000000

#define RTCF_BROADCAST	0x10000000

#define RTCF_BROADCAST	0x10000000

#define RTCF_MULTICAST	0x20000000

#define RTCF_MULTICAST	0x20000000

#define RTCF_REJECT	0x40000000

#define RTCF_REJECT	0x40000000 /* unused */

#define RTCF_LOCAL	0x80000000

#define RTCF_LOCAL	0x80000000





#define RTCF_NAT	(RTCF_DNAT|RTCF_SNAT)

#define RTCF_NAT	(RTCF_DNAT|RTCF_SNAT)

net/ipv4/route.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1792,7 +1792,7 @@ static int __mkroute_input(struct sk_buff *skb, 
	if (err)

	if (err)

		flags |= RTCF_DIRECTSRC;

		flags |= RTCF_DIRECTSRC;





	if (out_dev == in_dev && err && !(flags & RTCF_MASQ) &&

	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))))

		flags |= RTCF_DOREDIRECT;

		flags |= RTCF_DOREDIRECT;