Also removes an obsolete check for the unused flag RTCF_MASQ.
Unified · Split
| @@ -10,19 +10,19 @@ · 9 unmodified lines | ||
| 10 | 10 | #define RTCF_NOPMTUDISC RTM_F_NOPMTUDISC |
| 11 | 11 | |
| 12 | 12 | #define RTCF_NOTIFY 0x00010000 |
| 13 | −#define RTCF_DIRECTDST 0x00020000 | |
| 13 | +#define RTCF_DIRECTDST 0x00020000 /* unused */ | |
| 14 | 14 | #define RTCF_REDIRECTED 0x00040000 |
| 15 | −#define RTCF_TPROXY 0x00080000 | |
| 15 | +#define RTCF_TPROXY 0x00080000 /* unused */ | |
| 16 | 16 | |
| 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 */ | |
| 20 | 20 | #define RTCF_DOREDIRECT 0x01000000 |
| 21 | 21 | #define RTCF_DIRECTSRC 0x04000000 |
| 22 | 22 | #define RTCF_DNAT 0x08000000 |
| 23 | 23 | #define RTCF_BROADCAST 0x10000000 |
| 24 | 24 | #define RTCF_MULTICAST 0x20000000 |
| 25 | −#define RTCF_REJECT 0x40000000 | |
| 25 | +#define RTCF_REJECT 0x40000000 /* unused */ | |
| 26 | 26 | #define RTCF_LOCAL 0x80000000 |
| 27 | 27 | |
| 28 | 28 | #define RTCF_NAT (RTCF_DNAT|RTCF_SNAT) |
| @@ -1792,7 +1792,7 @@ static int __mkroute_input(struct sk_buff *skb, · 1791 unmodified lines | ||
| 1792 | 1792 | if (err) |
| 1793 | 1793 | flags |= RTCF_DIRECTSRC; |
| 1794 | 1794 | |
| 1795 | − if (out_dev == in_dev && err && !(flags & RTCF_MASQ) && | |
| 1795 | + if (out_dev == in_dev && err && | |
| 1796 | 1796 | (IN_DEV_SHARED_MEDIA(out_dev) || |
| 1797 | 1797 | inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res)))) |
| 1798 | 1798 | flags |= RTCF_DOREDIRECT; |