diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-11-26 12:02:54 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-11-26 12:02:54 +0800 |
| commit | 0681158391fc57e4c164989b5b7d41565fddf7e2 (patch) | |
| tree | 3e9caae3705c2114d7c487afe60c0d09407c16c9 /net/sctp/ipv6.c | |
| parent | 4874c07664d8a52253ca73c8dd53bf13aeb61acb (diff) | |
| parent | 7166ceea0a4eba3f8c86925ad60e6f0543db6234 (diff) | |
Merge tag 'v3.18.84' into linux-linaro-lsk-v3.18lsk-v3.18-17.11
This is the 3.18.84 stable release
Diffstat (limited to 'net/sctp/ipv6.c')
| -rw-r--r-- | net/sctp/ipv6.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index 70966fee8835..5b5ddc0f2dbc 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c @@ -805,6 +805,8 @@ static void sctp_inet6_skb_msgname(struct sk_buff *skb, char *msgname, if (ipv6_addr_type(&addr->v6.sin6_addr) & IPV6_ADDR_LINKLOCAL) { struct sctp_ulpevent *ev = sctp_skb2event(skb); addr->v6.sin6_scope_id = ev->iif; + } else { + addr->v6.sin6_scope_id = 0; } } |