diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 14:54:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 14:54:39 -0400 |
| commit | 804b908adfcffe3831621acb6c8a776585983d2a (patch) | |
| tree | 9664d4395ae8e590e50c568225ea88435383ed99 /net/ipv4/inet_hashtables.c | |
| parent | 1b3e4c706c19dec10b11dac1b23071e3e4b262ad (diff) | |
| parent | ce0e32e65f70337e0732c97499b643205fa8ea31 (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:
[NET]: Fix possible dev_deactivate race condition
[INET]: Justification for local port range robustness.
[PACKET]: Kill unused pg_vec_endpage() function
[NET]: QoS/Sched as menuconfig
[NET]: Fix bug in sk_filter race cures.
[PATCH] mac80211: make ieee802_11_parse_elems return void
Diffstat (limited to 'net/ipv4/inet_hashtables.c')
| -rw-r--r-- | net/ipv4/inet_hashtables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index fac6398e4367..16eecc7046a3 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c | |||
| @@ -286,7 +286,7 @@ int inet_hash_connect(struct inet_timewait_death_row *death_row, | |||
| 286 | struct inet_timewait_sock *tw = NULL; | 286 | struct inet_timewait_sock *tw = NULL; |
| 287 | 287 | ||
| 288 | inet_get_local_port_range(&low, &high); | 288 | inet_get_local_port_range(&low, &high); |
| 289 | remaining = high - low; | 289 | remaining = (high - low) + 1; |
| 290 | 290 | ||
| 291 | local_bh_disable(); | 291 | local_bh_disable(); |
| 292 | for (i = 1; i <= remaining; i++) { | 292 | for (i = 1; i <= remaining; i++) { |