Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/ipv4/ipmr.c
between commit:
44f49dd8b5a6 ("ipmr: fix possible race resulting from improper usage of IP_INC_STATS_BH() in preemptible context.")
from the net tree and commit:
758ccac8e741 ("ipv4: Only compute net once in ipmr_forward_finish")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc net/ipv4/ipmr.c
index 8e8203d5c520,fc42525d8694..000000000000
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@@ -1682,8 -1683,8 +1683,8 @@@ static inline int ipmr_forward_finish(s
{
struct ip_options *opt = &(IPCB(skb)->opt);
- IP_INC_STATS(dev_net(skb_dst(skb)->dev), IPSTATS_MIB_OUTFORWDATAGRAMS);
- IP_ADD_STATS(dev_net(skb_dst(skb)->dev), IPSTATS_MIB_OUTOCTETS, skb->len);
- 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);
@@@ -1745,7 -1746,7 +1746,7 @@@ static void ipmr_queue_xmit(struct net
* to blackhole.
*/
- IP_INC_STATS(dev_net(dev), IPSTATS_MIB_FRAGFAILS);
- IP_INC_STATS_BH(net, IPSTATS_MIB_FRAGFAILS);
++ IP_INC_STATS(net, IPSTATS_MIB_FRAGFAILS);
ip_rt_put(rt);
goto out_free;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
