* [PATCH net-next] l2tp: fix unused variable warning
@ 2014-03-07 22:57 Eric Dumazet
2014-03-10 19:32 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Eric Dumazet @ 2014-03-07 22:57 UTC (permalink / raw)
To: David Miller; +Cc: netdev
From: Eric Dumazet <edumazet@google.com>
net/l2tp/l2tp_core.c:1111:15: warning: unused variable
'sk' [-Wunused-variable]
Fixes: 31c70d5956fc ("l2tp: keep original skb ownership")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
net/l2tp/l2tp_core.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index 9958c31c2c54..dcab9ddc4388 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -1108,7 +1108,6 @@ static int l2tp_xmit_core(struct l2tp_session *session, struct sk_buff *skb,
struct flowi *fl, size_t data_len)
{
struct l2tp_tunnel *tunnel = session->tunnel;
- struct sock *sk = tunnel->sock;
unsigned int len = skb->len;
int error;
@@ -1132,7 +1131,7 @@ static int l2tp_xmit_core(struct l2tp_session *session, struct sk_buff *skb,
/* Queue the packet to IP for output */
skb->local_df = 1;
#if IS_ENABLED(CONFIG_IPV6)
- if (sk->sk_family == PF_INET6 && !tunnel->v4mapped)
+ if (tunnel->sock->sk_family == PF_INET6 && !tunnel->v4mapped)
error = inet6_csk_xmit(skb, NULL);
else
#endif
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] l2tp: fix unused variable warning
2014-03-07 22:57 [PATCH net-next] l2tp: fix unused variable warning Eric Dumazet
@ 2014-03-10 19:32 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-03-10 19:32 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 07 Mar 2014 14:57:43 -0800
> From: Eric Dumazet <edumazet@google.com>
>
> net/l2tp/l2tp_core.c:1111:15: warning: unused variable
> 'sk' [-Wunused-variable]
>
> Fixes: 31c70d5956fc ("l2tp: keep original skb ownership")
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
Applied, thanks Eric.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-10 19:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-07 22:57 [PATCH net-next] l2tp: fix unused variable warning Eric Dumazet
2014-03-10 19:32 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).