summaryrefslogtreecommitdiffstats
path: root/net/l2tp
diff options
context:
space:
mode:
authorDuan Jiong <duanj.fnst@cn.fujitsu.com>2014-08-01 09:52:58 +0800
committerDavid S. Miller <davem@davemloft.net>2014-07-31 22:37:06 -0700
commit4330487acfff0cf1d7b14d238583a182e0a444bb (patch)
tree701d320ce2855b936ca0a65359377590a80a209b /net/l2tp
parent7bcc6738eef36e7139c4293c321bc43f716e8d85 (diff)
downloadlinux-4330487acfff0cf1d7b14d238583a182e0a444bb.tar.gz
linux-4330487acfff0cf1d7b14d238583a182e0a444bb.tar.bz2
linux-4330487acfff0cf1d7b14d238583a182e0a444bb.zip
net: use inet6_iif instead of IP6CB()->iif
Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp')
-rw-r--r--net/l2tp/l2tp_ip6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
index f3f98a156cee..0edb263cc002 100644
--- a/net/l2tp/l2tp_ip6.c
+++ b/net/l2tp/l2tp_ip6.c
@@ -687,7 +687,7 @@ static int l2tp_ip6_recvmsg(struct kiocb *iocb, struct sock *sk,
lsa->l2tp_scope_id = 0;
lsa->l2tp_conn_id = 0;
if (ipv6_addr_type(&lsa->l2tp_addr) & IPV6_ADDR_LINKLOCAL)
- lsa->l2tp_scope_id = IP6CB(skb)->iif;
+ lsa->l2tp_scope_id = inet6_iif(skb);
}
if (np->rxopt.all)