Skip to contentSkip to conversation

driver/netfilter/nfnetlink: removed unused variable

PATCH In review Robin Schroer 3 participants 3 messages May 31, 2014 – Jun 2, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 driver/netfilter/nfnetlink: removed unused variable

Removes the unused struct net *net = sock_net(skb->sk);

---
 net/netfilter/nfnetlink.c | 1 -
 1 file changed, 1 deletion(-)
net/netfilter/nfnetlink.c +0 -1
index c138b8f..5cc9db2 100644
@@ -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;
Signature · 6 lines
1.9.3


-- 

Robin Schroer
#1 lore raw
Quoted 3 lines · Robin Schroer

Removes the unused struct net *net = sock_net(skb->sk);

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---

Quoted 29 lines
---
 net/netfilter/nfnetlink.c | 1 -
 1 file changed, 1 deletion(-)
net/netfilter/nfnetlink.c +0 -2
index c138b8f..5cc9db2 100644
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Signature · 2 lines
Thanks,
//richard
#2 lore raw
In reply to Robin Schroer
Quoted 1 line · Robin Schroer

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 <[email protected]>
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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html