diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 16:26:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 16:26:49 -0400 |
| commit | 45efebf2492187e8915e2876c5bf6f3803b1c23f (patch) | |
| tree | fef7ca620be5a61a243e7781bf50cb829972e4ca /net/sctp/sm_statetable.c | |
| parent | 4acbab84688bfea82322c14e809fc7d82242cee3 (diff) | |
| parent | 6e1d91039becc9d5bcd046d8c709dbaf471220e3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[ICMP]: Fix icmp_errors_use_inbound_ifaddr sysctl
[IPV4]: Fix "ipOutNoRoutes" counter error for TCP and UDP
[NET] gso: Fix GSO feature mask in sk_setup_caps
[TCP]: Fix GSO ignorance of pkts_acked arg (cong.cntrl modules)
[NET]: Fix comparisons of unsigned < 0.
[NET]: Make net watchdog timers 1 sec jiffy aligned.
[ATM]: Fix warning.
[TCP]: Use default 32768-61000 outgoing port range in all cases.
[AF_UNIX]: Fix datagram connect race causing an OOPS.
[TG3]: Fix link problem on Dell's onboard 5906.
[AF_UNIX]: Make socket locking much less confusing.
Diffstat (limited to 'net/sctp/sm_statetable.c')
| -rw-r--r-- | net/sctp/sm_statetable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/sm_statetable.c b/net/sctp/sm_statetable.c index 523071c7902f..70a91ece3c49 100644 --- a/net/sctp/sm_statetable.c +++ b/net/sctp/sm_statetable.c | |||
| @@ -960,7 +960,7 @@ static const sctp_sm_table_entry_t *sctp_chunk_event_lookup(sctp_cid_t cid, | |||
| 960 | if (state > SCTP_STATE_MAX) | 960 | if (state > SCTP_STATE_MAX) |
| 961 | return &bug; | 961 | return &bug; |
| 962 | 962 | ||
| 963 | if (cid >= 0 && cid <= SCTP_CID_BASE_MAX) | 963 | if (cid <= SCTP_CID_BASE_MAX) |
| 964 | return &chunk_event_table[cid][state]; | 964 | return &chunk_event_table[cid][state]; |
| 965 | 965 | ||
| 966 | if (sctp_prsctp_enable) { | 966 | if (sctp_prsctp_enable) { |