diff options
| author | Thomas Graf <tgraf@suug.ch> | 2008-06-03 16:36:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-03 16:36:01 -0700 |
| commit | 51b77cae0d5aa8e1546fca855dcfe48ddfadfa9c (patch) | |
| tree | 5d6824e94b09784b6b41f39ca08e11844bc73c7b | |
| parent | 7557af25155a82ac2dad73eec6b0166868bf8ea2 (diff) | |
| download | kernel_samsung_crespo-51b77cae0d5aa8e1546fca855dcfe48ddfadfa9c.zip kernel_samsung_crespo-51b77cae0d5aa8e1546fca855dcfe48ddfadfa9c.tar.gz kernel_samsung_crespo-51b77cae0d5aa8e1546fca855dcfe48ddfadfa9c.tar.bz2 | |
route: Mark unused route cache flags as such.
Also removes an obsolete check for the unused flag RTCF_MASQ.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/in_route.h | 12 | ||||
| -rw-r--r-- | net/ipv4/route.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/in_route.h b/include/linux/in_route.h index 61f25c3..b261b8c 100644 --- a/include/linux/in_route.h +++ b/include/linux/in_route.h @@ -10,19 +10,19 @@ #define RTCF_NOPMTUDISC RTM_F_NOPMTUDISC #define RTCF_NOTIFY 0x00010000 -#define RTCF_DIRECTDST 0x00020000 +#define RTCF_DIRECTDST 0x00020000 /* unused */ #define RTCF_REDIRECTED 0x00040000 -#define RTCF_TPROXY 0x00080000 +#define RTCF_TPROXY 0x00080000 /* unused */ -#define RTCF_FAST 0x00200000 -#define RTCF_MASQ 0x00400000 -#define RTCF_SNAT 0x00800000 +#define RTCF_FAST 0x00200000 /* unused */ +#define RTCF_MASQ 0x00400000 /* unused */ +#define RTCF_SNAT 0x00800000 /* unused */ #define RTCF_DOREDIRECT 0x01000000 #define RTCF_DIRECTSRC 0x04000000 #define RTCF_DNAT 0x08000000 #define RTCF_BROADCAST 0x10000000 #define RTCF_MULTICAST 0x20000000 -#define RTCF_REJECT 0x40000000 +#define RTCF_REJECT 0x40000000 /* unused */ #define RTCF_LOCAL 0x80000000 #define RTCF_NAT (RTCF_DNAT|RTCF_SNAT) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index df41026..96be336 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1792,7 +1792,7 @@ static int __mkroute_input(struct sk_buff *skb, if (err) flags |= RTCF_DIRECTSRC; - if (out_dev == in_dev && err && !(flags & RTCF_MASQ) && + if (out_dev == in_dev && err && (IN_DEV_SHARED_MEDIA(out_dev) || inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res)))) flags |= RTCF_DOREDIRECT; |