diff options
author | Eric Dumazet <edumazet@google.com> | 2014-03-07 17:57:43 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-10 15:32:24 -0400 |
commit | 746e349980cb4dd73046434b25432257eefbbb72 (patch) | |
tree | d34c1821441d2e819c02008e17b148a73a00a4dd /net/l2tp/l2tp_core.c | |
parent | c120e9e03090b4f9578ca38ef4250ff3805b6e3f (diff) |
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/l2tp_core.c')
-rw-r--r-- | net/l2tp/l2tp_core.c | 3 |
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, | |||
1108 | struct flowi *fl, size_t data_len) | 1108 | struct flowi *fl, size_t data_len) |
1109 | { | 1109 | { |
1110 | struct l2tp_tunnel *tunnel = session->tunnel; | 1110 | struct l2tp_tunnel *tunnel = session->tunnel; |
1111 | struct sock *sk = tunnel->sock; | ||
1112 | unsigned int len = skb->len; | 1111 | unsigned int len = skb->len; |
1113 | int error; | 1112 | int error; |
1114 | 1113 | ||
@@ -1132,7 +1131,7 @@ static int l2tp_xmit_core(struct l2tp_session *session, struct sk_buff *skb, | |||
1132 | /* Queue the packet to IP for output */ | 1131 | /* Queue the packet to IP for output */ |
1133 | skb->local_df = 1; | 1132 | skb->local_df = 1; |
1134 | #if IS_ENABLED(CONFIG_IPV6) | 1133 | #if IS_ENABLED(CONFIG_IPV6) |
1135 | if (sk->sk_family == PF_INET6 && !tunnel->v4mapped) | 1134 | if (tunnel->sock->sk_family == PF_INET6 && !tunnel->v4mapped) |
1136 | error = inet6_csk_xmit(skb, NULL); | 1135 | error = inet6_csk_xmit(skb, NULL); |
1137 | else | 1136 | else |
1138 | #endif | 1137 | #endif |