diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-27 04:03:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-27 04:03:03 -0400 |
| commit | e40051d134f7ee95c8c1f7a3471e84eafc9ab326 (patch) | |
| tree | 88eb44e49a75721ae926665a2c42f08badac9d07 /net/ipv4/tcp_input.c | |
| parent | 42099d7a3941d4aaf853caac92b3ae76149fc6e7 (diff) | |
| parent | 2cc6d2bf3d6195fabcf0febc192c01f99519a8f3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/qlcnic/qlcnic_init.c
net/ipv4/ip_output.c
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 51966b3f9719..fabc09a58d7f 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -4035,6 +4035,8 @@ static void tcp_reset(struct sock *sk) | |||
| 4035 | default: | 4035 | default: |
| 4036 | sk->sk_err = ECONNRESET; | 4036 | sk->sk_err = ECONNRESET; |
| 4037 | } | 4037 | } |
| 4038 | /* This barrier is coupled with smp_rmb() in tcp_poll() */ | ||
| 4039 | smp_wmb(); | ||
| 4038 | 4040 | ||
| 4039 | if (!sock_flag(sk, SOCK_DEAD)) | 4041 | if (!sock_flag(sk, SOCK_DEAD)) |
| 4040 | sk->sk_error_report(sk); | 4042 | sk->sk_error_report(sk); |