Patchwork [net-next,04/14] ipv6: added net argument to IP6_INC_STATS_BH

login
register
mail settings
Submitter David Miller
Date Oct. 8, 2008, 6:13 p.m.
Message ID <20081008.111309.227060133.davem@davemloft.net>
Download mbox | patch
Permalink /patch/3333/
State Not Applicable
Headers show

Comments

David Miller - Oct. 8, 2008, 6:13 p.m.
From: "Denis V. Lunev" <den@openvz.org>
Date: Wed,  8 Oct 2008 15:51:52 +0400

> Signed-off-by: Denis V. Lunev <den@openvz.org>

Please type "make allmodconfig" before all test builds.
Or at least use grep when changing interface signatures.

You missed net/ipv6/ip6mr.c in these changes.

I added the following change to your commit to fix the
build:

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Denis V. Lunev - Oct. 8, 2008, 7:07 p.m.
On Wed, 2008-10-08 at 11:13 -0700, David Miller wrote:
> From: "Denis V. Lunev" <den@openvz.org>
> Date: Wed,  8 Oct 2008 15:51:52 +0400
> 
> > Signed-off-by: Denis V. Lunev <den@openvz.org>
> 
> Please type "make allmodconfig" before all test builds.
> Or at least use grep when changing interface signatures.
> 
> You missed net/ipv6/ip6mr.c in these changes.
> 
> I added the following change to your commit to fix the
> build:
> 
> diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
> index 095bc45..182f8a1 100644
> --- a/net/ipv6/ip6mr.c
> +++ b/net/ipv6/ip6mr.c
> @@ -1383,7 +1383,8 @@ int ip6mr_ioctl(struct sock *sk, int cmd, void __user *arg)
>  
>  static inline int ip6mr_forward2_finish(struct sk_buff *skb)
>  {
> -	IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_OUTFORWDATAGRAMS);
> +	IP6_INC_STATS_BH(dev_net(skb->dst->dev), ip6_dst_idev(skb->dst),
> +			 IPSTATS_MIB_OUTFORWDATAGRAMS);
>  	return dst_output(skb);
>  }
>  

sorry. thanks a lot


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 095bc45..182f8a1 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -1383,7 +1383,8 @@  int ip6mr_ioctl(struct sock *sk, int cmd, void __user *arg)
 
 static inline int ip6mr_forward2_finish(struct sk_buff *skb)
 {
-	IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_OUTFORWDATAGRAMS);
+	IP6_INC_STATS_BH(dev_net(skb->dst->dev), ip6_dst_idev(skb->dst),
+			 IPSTATS_MIB_OUTFORWDATAGRAMS);
 	return dst_output(skb);
 }