History

route: Mark unused route cache flags as such.

Also removes an obsolete check for the unused flag RTCF_MASQ.

Thomas Graf committed 18 years ago

Commit 51b77ca1 parent 7557af22 files · +7 −7Browse files

Unified · Split

2 files
  1. include/linux/in_route.h +6 −6
  2. net/ipv4/route.c +1 −1
include/linux/in_route.h+6−6
@@ -10,19 +10,19 @@ · 9 unmodified lines
1010 #define RTCF_NOPMTUDISC RTM_F_NOPMTUDISC
1111
1212 #define RTCF_NOTIFY 0x00010000
13−#define RTCF_DIRECTDST 0x00020000
13+#define RTCF_DIRECTDST 0x00020000 /* unused */
1414 #define RTCF_REDIRECTED 0x00040000
15−#define RTCF_TPROXY 0x00080000
15+#define RTCF_TPROXY 0x00080000 /* unused */
1616
17−#define RTCF_FAST 0x00200000
18−#define RTCF_MASQ 0x00400000
19−#define RTCF_SNAT 0x00800000
17+#define RTCF_FAST 0x00200000 /* unused */
18+#define RTCF_MASQ 0x00400000 /* unused */
19+#define RTCF_SNAT 0x00800000 /* unused */
2020 #define RTCF_DOREDIRECT 0x01000000
2121 #define RTCF_DIRECTSRC 0x04000000
2222 #define RTCF_DNAT 0x08000000
2323 #define RTCF_BROADCAST 0x10000000
2424 #define RTCF_MULTICAST 0x20000000
25−#define RTCF_REJECT 0x40000000
25+#define RTCF_REJECT 0x40000000 /* unused */
2626 #define RTCF_LOCAL 0x80000000
2727
2828 #define RTCF_NAT (RTCF_DNAT|RTCF_SNAT)
net/ipv4/route.c+1−1
@@ -1792,7 +1792,7 @@ static int __mkroute_input(struct sk_buff *skb, · 1791 unmodified lines
17921792 if (err)
17931793 flags |= RTCF_DIRECTSRC;
17941794
1795− if (out_dev == in_dev && err && !(flags & RTCF_MASQ) &&
1795+ if (out_dev == in_dev && err &&
17961796 (IN_DEV_SHARED_MEDIA(out_dev) ||
17971797 inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res))))
17981798 flags |= RTCF_DOREDIRECT;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t