diff options
Diffstat (limited to 'include/net/inet_sock.h')
-rw-r--r-- | include/net/inet_sock.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index 89cd011edb99..a42cd63d241a 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h | |||
@@ -43,8 +43,7 @@ struct ip_options { | |||
43 | unsigned char srr; | 43 | unsigned char srr; |
44 | unsigned char rr; | 44 | unsigned char rr; |
45 | unsigned char ts; | 45 | unsigned char ts; |
46 | unsigned char is_data:1, | 46 | unsigned char is_strictroute:1, |
47 | is_strictroute:1, | ||
48 | srr_is_hit:1, | 47 | srr_is_hit:1, |
49 | is_changed:1, | 48 | is_changed:1, |
50 | rr_needaddr:1, | 49 | rr_needaddr:1, |
@@ -137,7 +136,7 @@ struct inet_sock { | |||
137 | unsigned int flags; | 136 | unsigned int flags; |
138 | unsigned int fragsize; | 137 | unsigned int fragsize; |
139 | struct ip_options *opt; | 138 | struct ip_options *opt; |
140 | struct rtable *rt; | 139 | struct dst_entry *dst; |
141 | int length; /* Total length of all frames */ | 140 | int length; /* Total length of all frames */ |
142 | __be32 addr; | 141 | __be32 addr; |
143 | struct flowi fl; | 142 | struct flowi fl; |
@@ -195,7 +194,7 @@ static inline int inet_sk_ehashfn(const struct sock *sk) | |||
195 | 194 | ||
196 | static inline int inet_iif(const struct sk_buff *skb) | 195 | static inline int inet_iif(const struct sk_buff *skb) |
197 | { | 196 | { |
198 | return ((struct rtable *)skb->dst)->rt_iif; | 197 | return skb->rtable->rt_iif; |
199 | } | 198 | } |
200 | 199 | ||
201 | #endif /* _INET_SOCK_H */ | 200 | #endif /* _INET_SOCK_H */ |