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
10#define RTCF_NOPMTUDISC RTM_F_NOPMTUDISC10#define RTCF_NOPMTUDISC RTM_F_NOPMTUDISC
11 11
12#define RTCF_NOTIFY 0x0001000012#define RTCF_NOTIFY 0x00010000
13#define RTCF_DIRECTDST 0x0002000013#define RTCF_DIRECTDST 0x00020000 /* unused */
14#define RTCF_REDIRECTED 0x0004000014#define RTCF_REDIRECTED 0x00040000
15#define RTCF_TPROXY 0x0008000015#define RTCF_TPROXY 0x00080000 /* unused */
16 16
17#define RTCF_FAST 0x0020000017#define RTCF_FAST 0x00200000 /* unused */
18#define RTCF_MASQ 0x0040000018#define RTCF_MASQ 0x00400000 /* unused */
19#define RTCF_SNAT 0x0080000019#define RTCF_SNAT 0x00800000 /* unused */
20#define RTCF_DOREDIRECT 0x0100000020#define RTCF_DOREDIRECT 0x01000000
21#define RTCF_DIRECTSRC 0x0400000021#define RTCF_DIRECTSRC 0x04000000
22#define RTCF_DNAT 0x0800000022#define RTCF_DNAT 0x08000000
23#define RTCF_BROADCAST 0x1000000023#define RTCF_BROADCAST 0x10000000
24#define RTCF_MULTICAST 0x2000000024#define RTCF_MULTICAST 0x20000000
25#define RTCF_REJECT 0x4000000025#define RTCF_REJECT 0x40000000 /* unused */
26#define RTCF_LOCAL 0x8000000026#define RTCF_LOCAL 0x80000000
27 27
28#define RTCF_NAT (RTCF_DNAT|RTCF_SNAT)28#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
1792 if (err)1792 if (err)
1793 flags |= RTCF_DIRECTSRC;1793 flags |= RTCF_DIRECTSRC;
1794 1794
1795 if (out_dev == in_dev && err && !(flags & RTCF_MASQ) &&1795 if (out_dev == in_dev && err &&
1796 (IN_DEV_SHARED_MEDIA(out_dev) ||1796 (IN_DEV_SHARED_MEDIA(out_dev) ||
1797 inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res))))1797 inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res))))
1798 flags |= RTCF_DOREDIRECT;1798 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