diff options
| author | David S. Miller <davem@davemloft.net> | 2015-11-03 21:41:45 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-03 21:41:45 +0300 |
| commit | 73186df8d7fa574345f0ad626ebe89649f8308a5 (patch) | |
| tree | 9e6ed2c499cb5cbbcc79415602f9114503bb6931 /net/ipv4/ipmr.c | |
| parent | 0c63d80c3fac4e6eb0f01dff756e47bc7cd50092 (diff) | |
| parent | ebac62fe3d24c0ce22dd83afa7b07d1a2aaef44d (diff) | |
| download | linux-73186df8d7fa574345f0ad626ebe89649f8308a5.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor overlapping changes in net/ipv4/ipmr.c, in 'net' we were
fixing the "BH-ness" of the counter bumps whilst in 'net-next'
the functions were modified to take an explicit 'net' parameter.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipmr.c')
| -rw-r--r-- | net/ipv4/ipmr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index fc42525d8694..92dd4b74d513 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -1683,8 +1683,8 @@ static inline int ipmr_forward_finish(struct net *net, struct sock *sk, { struct ip_options *opt = &(IPCB(skb)->opt); - IP_INC_STATS_BH(net, IPSTATS_MIB_OUTFORWDATAGRAMS); - IP_ADD_STATS_BH(net, IPSTATS_MIB_OUTOCTETS, skb->len); + IP_INC_STATS(net, IPSTATS_MIB_OUTFORWDATAGRAMS); + IP_ADD_STATS(net, IPSTATS_MIB_OUTOCTETS, skb->len); if (unlikely(opt->optlen)) ip_forward_options(skb); @@ -1746,7 +1746,7 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt, * to blackhole. */ - IP_INC_STATS_BH(net, IPSTATS_MIB_FRAGFAILS); + IP_INC_STATS(net, IPSTATS_MIB_FRAGFAILS); ip_rt_put(rt); goto out_free; } |