diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-12-17 15:22:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-12-17 15:22:35 +0100 |
| commit | ffe732c2430c55074bebb172d33d909c662cd0e3 (patch) | |
| tree | d39087d7b5d8caa505b23b6ea2abc2e33efa5be5 /net/ipv4/tcp_ipv4.c | |
| parent | 40ea2b42d7c44386cf81d5636d574193da2c8df2 (diff) | |
| parent | 757dfcaa41844595964f1220f1d33182dae49976 (diff) | |
Merge branch 'sched/urgent' into sched/core
Merge the latest batch of fixes before applying development patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 59a6f8b90cd9..067213924751 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -177,7 +177,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) if (IS_ERR(rt)) { err = PTR_ERR(rt); if (err == -ENETUNREACH) - IP_INC_STATS_BH(sock_net(sk), IPSTATS_MIB_OUTNOROUTES); + IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTNOROUTES); return err; } |