git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211/iwlwifi: move virtual A-MDPU queue bookkeeping to iwlwifi
[safe/jmp/linux-2.6]
/
include
/
net
/
inet_sock.h
diff --git
a/include/net/inet_sock.h
b/include/net/inet_sock.h
index
e97b66e
..
de0ecc7
100644
(file)
--- a/
include/net/inet_sock.h
+++ b/
include/net/inet_sock.h
@@
-24,7
+24,6
@@
#include <net/flow.h>
#include <net/sock.h>
#include <net/request_sock.h>
#include <net/flow.h>
#include <net/sock.h>
#include <net/request_sock.h>
-#include <net/route.h>
#include <net/netns/hash.h>
/** struct ip_options - IP Options
#include <net/netns/hash.h>
/** struct ip_options - IP Options
@@
-62,8
+61,8
@@
struct inet_request_sock {
struct request_sock req;
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
u16 inet6_rsk_offset;
struct request_sock req;
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
u16 inet6_rsk_offset;
- /* 2 bytes hole, try to pack */
#endif
#endif
+ __be16 loc_port;
__be32 loc_addr;
__be32 rmt_addr;
__be16 rmt_port;
__be32 loc_addr;
__be32 rmt_addr;
__be16 rmt_port;
@@
-73,7
+72,8
@@
struct inet_request_sock {
sack_ok : 1,
wscale_ok : 1,
ecn_ok : 1,
sack_ok : 1,
wscale_ok : 1,
ecn_ok : 1,
- acked : 1;
+ acked : 1,
+ no_srccheck: 1;
struct ip_options *opt;
};
struct ip_options *opt;
};
@@
-195,12
+195,6
@@
static inline int inet_sk_ehashfn(const struct sock *sk)
return inet_ehashfn(net, laddr, lport, faddr, fport);
}
return inet_ehashfn(net, laddr, lport, faddr, fport);
}
-
-static inline int inet_iif(const struct sk_buff *skb)
-{
- return skb->rtable->rt_iif;
-}
-
static inline struct request_sock *inet_reqsk_alloc(struct request_sock_ops *ops)
{
struct request_sock *req = reqsk_alloc(ops);
static inline struct request_sock *inet_reqsk_alloc(struct request_sock_ops *ops)
{
struct request_sock *req = reqsk_alloc(ops);
@@
-211,4
+205,9
@@
static inline struct request_sock *inet_reqsk_alloc(struct request_sock_ops *ops
return req;
}
return req;
}
+static inline __u8 inet_sk_flowi_flags(const struct sock *sk)
+{
+ return inet_sk(sk)->transparent ? FLOWI_FLAG_ANYSRC : 0;
+}
+
#endif /* _INET_SOCK_H */
#endif /* _INET_SOCK_H */