diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-08-07 11:25:24 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-15 10:30:37 +0400 |
| commit | 55e26eb95a5345a5796babac98de6d6c42771df1 (patch) | |
| tree | 65560cf23dbd241f38e86b6b82d1b5d286605ba5 /net/sctp/input.c | |
| parent | ebb7e95d9351f77a8ec1fca20eb645051401b7b2 (diff) | |
| download | linux-55e26eb95a5345a5796babac98de6d6c42771df1.tar.xz | |
sctp: Push struct net down to sctp_chunk_event_lookup
This trickles up through sctp_sm_lookup_event up to sctp_do_sm
and up further into sctp_primitiv_NAME before the code reaches
places where struct net can be reliably found.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/input.c')
| -rw-r--r-- | net/sctp/input.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sctp/input.c b/net/sctp/input.c index 530830151f04..a2ceb70ee06c 100644 --- a/net/sctp/input.c +++ b/net/sctp/input.c @@ -466,11 +466,13 @@ void sctp_icmp_proto_unreachable(struct sock *sk, } } else { + struct net *net = sock_net(sk); + if (timer_pending(&t->proto_unreach_timer) && del_timer(&t->proto_unreach_timer)) sctp_association_put(asoc); - sctp_do_sm(SCTP_EVENT_T_OTHER, + sctp_do_sm(net, SCTP_EVENT_T_OTHER, SCTP_ST_OTHER(SCTP_EVENT_ICMP_PROTO_UNREACH), asoc->state, asoc->ep, asoc, t, GFP_ATOMIC); |