diff options
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/inet6_hashtables.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h index 668056b4bb0b..fdff630708ce 100644 --- a/include/net/inet6_hashtables.h +++ b/include/net/inet6_hashtables.h | |||
| @@ -57,34 +57,37 @@ extern void __inet6_hash(struct inet_hashinfo *hashinfo, struct sock *sk); | |||
| 57 | * | 57 | * |
| 58 | * The sockhash lock must be held as a reader here. | 58 | * The sockhash lock must be held as a reader here. |
| 59 | */ | 59 | */ |
| 60 | extern struct sock *__inet6_lookup_established(struct inet_hashinfo *hashinfo, | 60 | extern struct sock *__inet6_lookup_established(struct net *net, |
| 61 | struct inet_hashinfo *hashinfo, | ||
| 61 | const struct in6_addr *saddr, | 62 | const struct in6_addr *saddr, |
| 62 | const __be16 sport, | 63 | const __be16 sport, |
| 63 | const struct in6_addr *daddr, | 64 | const struct in6_addr *daddr, |
| 64 | const u16 hnum, | 65 | const u16 hnum, |
| 65 | const int dif); | 66 | const int dif); |
| 66 | 67 | ||
| 67 | extern struct sock *inet6_lookup_listener(struct inet_hashinfo *hashinfo, | 68 | extern struct sock *inet6_lookup_listener(struct net *net, |
| 69 | struct inet_hashinfo *hashinfo, | ||
| 68 | const struct in6_addr *daddr, | 70 | const struct in6_addr *daddr, |
| 69 | const unsigned short hnum, | 71 | const unsigned short hnum, |
| 70 | const int dif); | 72 | const int dif); |
| 71 | 73 | ||
| 72 | static inline struct sock *__inet6_lookup(struct inet_hashinfo *hashinfo, | 74 | static inline struct sock *__inet6_lookup(struct net *net, |
| 75 | struct inet_hashinfo *hashinfo, | ||
| 73 | const struct in6_addr *saddr, | 76 | const struct in6_addr *saddr, |
| 74 | const __be16 sport, | 77 | const __be16 sport, |
| 75 | const struct in6_addr *daddr, | 78 | const struct in6_addr *daddr, |
| 76 | const u16 hnum, | 79 | const u16 hnum, |
| 77 | const int dif) | 80 | const int dif) |
| 78 | { | 81 | { |
| 79 | struct sock *sk = __inet6_lookup_established(hashinfo, saddr, sport, | 82 | struct sock *sk = __inet6_lookup_established(net, hashinfo, saddr, |
| 80 | daddr, hnum, dif); | 83 | sport, daddr, hnum, dif); |
| 81 | if (sk) | 84 | if (sk) |
| 82 | return sk; | 85 | return sk; |
| 83 | 86 | ||
| 84 | return inet6_lookup_listener(hashinfo, daddr, hnum, dif); | 87 | return inet6_lookup_listener(net, hashinfo, daddr, hnum, dif); |
| 85 | } | 88 | } |
| 86 | 89 | ||
| 87 | extern struct sock *inet6_lookup(struct inet_hashinfo *hashinfo, | 90 | extern struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo, |
| 88 | const struct in6_addr *saddr, const __be16 sport, | 91 | const struct in6_addr *saddr, const __be16 sport, |
| 89 | const struct in6_addr *daddr, const __be16 dport, | 92 | const struct in6_addr *daddr, const __be16 dport, |
| 90 | const int dif); | 93 | const int dif); |