diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-08-06 08:41:13 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-14 22:44:12 -0700 |
| commit | 4110cc255ddec59c79fba4d71cdd948d0a382140 (patch) | |
| tree | 53fc9c7cd7e41f547d94469f9268fde2a5404616 /net/sctp/ipv6.c | |
| parent | 4cdadcbcb64bdf3ae8bdf3ef5bb2b91c85444cfa (diff) | |
| download | op-kernel-dev-4110cc255ddec59c79fba4d71cdd948d0a382140.zip op-kernel-dev-4110cc255ddec59c79fba4d71cdd948d0a382140.tar.gz | |
sctp: Make the association hashtable handle multiple network namespaces
- Use struct net in the hash calculation
- Use sock_net(association.base.sk) in the association lookups.
- On receive calculate the network namespace from skb->dev.
- Pass struct net from receive down to the functions that actually
do the association lookup.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/ipv6.c')
| -rw-r--r-- | net/sctp/ipv6.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index ed7139e..2165a7e 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c @@ -154,6 +154,7 @@ SCTP_STATIC void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, struct ipv6_pinfo *np; sk_buff_data_t saveip, savesctp; int err; + struct net *net = dev_net(skb->dev); idev = in6_dev_get(skb->dev); @@ -162,7 +163,7 @@ SCTP_STATIC void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, savesctp = skb->transport_header; skb_reset_network_header(skb); skb_set_transport_header(skb, offset); - sk = sctp_err_lookup(AF_INET6, skb, sctp_hdr(skb), &asoc, &transport); + sk = sctp_err_lookup(net, AF_INET6, skb, sctp_hdr(skb), &asoc, &transport); /* Put back, the original pointers. */ skb->network_header = saveip; skb->transport_header = savesctp; |
