summaryrefslogtreecommitdiffstats
path: root/net/l2tp
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2014-03-07 14:57:43 -0800
committerDavid S. Miller <davem@davemloft.net>2014-03-10 15:32:24 -0400
commit746e349980cb4dd73046434b25432257eefbbb72 (patch)
treed34c1821441d2e819c02008e17b148a73a00a4dd /net/l2tp
parentc120e9e03090b4f9578ca38ef4250ff3805b6e3f (diff)
downloadblackbird-op-linux-746e349980cb4dd73046434b25432257eefbbb72.tar.gz
blackbird-op-linux-746e349980cb4dd73046434b25432257eefbbb72.zip
l2tp: fix unused variable warning
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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp')
-rw-r--r--net/l2tp/l2tp_core.c3
1 files changed, 1 insertions, 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
OpenPOWER on IntegriCloud