projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pwm/for-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...
[cascardo/linux.git]
/
net
/
l2tp
/
l2tp_ip6.c
diff --git
a/net/l2tp/l2tp_ip6.c
b/net/l2tp/l2tp_ip6.c
index
f3f98a1
..
0edb263
100644
(file)
--- 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)