| Message ID | 20140531110628.GA30443@shodan.fritz.box |
|---|---|
| State | Superseded |
| Headers | show |
On Sat, May 31, 2014 at 1:06 PM, Robin Schroer <sulamiification@gmail.com> wrote: > Removes the unused struct net *net = sock_net(skb->sk); > > Signed-off-by: Robin Schroer <sulamiification@gmail.com> Against which tree is that patch? net-next.git still uses net in nfnetlink_rcv_batch() AFAICT. ---cut--- if (err < 0) goto ack; if (nc->call_batch) { err = nc->call_batch(net->nfnl, skb, nlh, (const struct nlattr **)cda); } /* The lock was released to autoload some module, we * have to abort and start from scratch using the * original skb. */ ---cut--- > --- > net/netfilter/nfnetlink.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c > index c138b8f..5cc9db2 100644 > --- a/net/netfilter/nfnetlink.c > +++ b/net/netfilter/nfnetlink.c > @@ -226,7 +226,6 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh, > u_int16_t subsys_id) > { > struct sk_buff *nskb, *oskb = skb; > - struct net *net = sock_net(skb->sk); > const struct nfnetlink_subsystem *ss; > const struct nfnl_callback *nc; > bool success = true, done = false; > -- > 1.9.3 > > > -- > > Robin Schroer > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/
On Sat, May 31, 2014 at 01:06:28PM +0200, Robin Schroer wrote:
> Removes the unused struct net *net = sock_net(skb->sk);
David already applied a patch for this in master.
commit a64d90fd962c2956da7505f98a302408450365e2
Author: David S. Miller <davem@davemloft.net>
Date: Thu Apr 24 13:51:29 2014 -0400
netfilter: Fix warning in nfnetlink_receive().
net/netfilter/nfnetlink.c: In function ‘nfnetlink_rcv’:
net/netfilter/nfnetlink.c:371:14: warning: unused variable ‘net’ [-Wunused-variable]
Thanks anyway.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c index c138b8f..5cc9db2 100644 --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c @@ -226,7 +226,6 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh, u_int16_t subsys_id) { struct sk_buff *nskb, *oskb = skb; - struct net *net = sock_net(skb->sk); const struct nfnetlink_subsystem *ss; const struct nfnl_callback *nc; bool success = true, done = false;
Removes the unused struct net *net = sock_net(skb->sk); Signed-off-by: Robin Schroer <sulamiification@gmail.com> --- net/netfilter/nfnetlink.c | 1 - 1 file changed, 1 deletion(-)