diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-01-15 08:47:25 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-29 00:02:37 +0100 |
| commit | 4a64830af0fd4dbec908cfbab117def5086acd4a (patch) | |
| tree | fe14178c897058761d20fa47850452aaef9bb8c5 | |
| parent | [NETFILTER]: nf_conntrack_sctp: rename "newconntrack" variable (diff) | |
| download | linux-4a64830af0fd4dbec908cfbab117def5086acd4a.tar.xz linux-4a64830af0fd4dbec908cfbab117def5086acd4a.zip | |
[NETFILTER]: nf_conntrack_sctp: don't take sctp_lock once per chunk
Don't take and release the lock once per SCTP chunk, simply hold it
the entire time while iterating through the chunks.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/netfilter/nf_conntrack_proto_sctp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c index 7baabc045342..177e8f60aa1c 100644 --- a/net/netfilter/nf_conntrack_proto_sctp.c +++ b/net/netfilter/nf_conntrack_proto_sctp.c @@ -325,9 +325,8 @@ static int sctp_packet(struct nf_conn *ct, } old_state = new_state = SCTP_CONNTRACK_MAX; + write_lock_bh(&sctp_lock); for_each_sctp_chunk (skb, sch, _sch, offset, dataoff, count) { - write_lock_bh(&sctp_lock); - /* Special cases of Verification tag check (Sec 8.5.1) */ if (sch->type == SCTP_CID_INIT) { /* Sec 8.5.1 (A) */ @@ -378,8 +377,8 @@ static int sctp_packet(struct nf_conn *ct, ct->proto.sctp.state = new_state; if (old_state != new_state) nf_conntrack_event_cache(IPCT_PROTOINFO, skb); - write_unlock_bh(&sctp_lock); } + write_unlock_bh(&sctp_lock); nf_ct_refresh_acct(ct, ctinfo, skb, *sctp_timeouts[new_state]); |