diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-11-26 12:03:19 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-11-26 12:03:19 +0800 |
| commit | d8e6d09cfa7260b12501ce94ca35977be998d4a7 (patch) | |
| tree | 1fe3a34e78b5978fe95fb6ba96f7d070778d5c7a /net/sctp/ipv6.c | |
| parent | c0426ccf530144f8af2e68165aa10cc52cd8f803 (diff) | |
| parent | 29ffb9c1fb4acbda207985ad1558191ffb776bee (diff) | |
Merge tag 'v4.4.102' into linux-linaro-lsk-v4.4lsk-v4.4-17.11
This is the 4.4.102 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 e33e9bd4ed5a..8a61ccc37e12 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c @@ -806,6 +806,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; } } |