diff options
| author | Thomas Graf <tgraf@suug.ch> | 2005-03-16 02:20:49 +0100 |
|---|---|---|
| committer | Thomas Graf <tgraf@suug.ch> | 2005-03-16 02:20:49 +0100 |
| commit | e183abe614020361c722cf4a1be7f5e2d0853fa4 (patch) | |
| tree | d15d48afde32309a8813c1e575d60a3033668e2b /include/net | |
| parent | edca4cb448ccb4d88ecfcb9edf320eb3f9fd7828 (diff) | |
[NET] Convert sk_localroute into SOCK_LOCALROUTE flag and use RT_CONN_FLAGS where appropriate
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/route.h | 2 | ||||
| -rw-r--r-- | include/net/sock.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/net/route.h b/include/net/route.h index 6228a91777dc..8bbbe3f02719 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -44,7 +44,7 @@ /* RTO_CONN is not used (being alias for 0), but preserved not to break * some modules referring to it. */ -#define RT_CONN_FLAGS(sk) (RT_TOS(inet_sk(sk)->tos) | sk->sk_localroute) +#define RT_CONN_FLAGS(sk) (RT_TOS(inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE)) struct inet_peer; struct rtable diff --git a/include/net/sock.h b/include/net/sock.h index 94b74b2e9172..b9d770d2cbdd 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -147,7 +147,6 @@ struct sock_common { * @sk_max_ack_backlog - listen backlog set in listen() * @sk_priority - %SO_PRIORITY setting * @sk_type - socket type (%SOCK_STREAM, etc) - * @sk_localroute - route locally only, %SO_DONTROUTE setting * @sk_protocol - which protocol this socket belongs in this network family * @sk_peercred - %SO_PEERCRED setting * @sk_rcvlowat - %SO_RCVLOWAT setting @@ -226,7 +225,6 @@ struct sock { unsigned short sk_max_ack_backlog; __u32 sk_priority; unsigned short sk_type; - unsigned char sk_localroute; unsigned char sk_protocol; struct ucred sk_peercred; int sk_rcvlowat; @@ -386,6 +384,7 @@ enum sock_flags { SOCK_DBG, /* %SO_DEBUG setting */ SOCK_RCVTSTAMP, /* %SO_TIMESTAMP setting */ SOCK_NO_LARGESEND, /* whether to sent large segments or not */ + SOCK_LOCALROUTE, /* route locally only, %SO_DONTROUTE setting */ }; static inline void sock_set_flag(struct sock *sk, enum sock_flags flag) |