diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2018-01-11 04:14:45 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-01-11 04:14:45 -0800 |
| commit | e525ef12a4ba7da1569592615fddf082c51b2f3e (patch) | |
| tree | 5733d8ac1a78313edf973cf0e265f0fefafd4308 /net/sctp/ipv6.c | |
| parent | 1707cb3ff140dec01127669e1c88d5b850f272e4 (diff) | |
| parent | 80eb7ccae411759ac85501602aae882dede1c7fa (diff) | |
Merge "Merge android-4.4.104 (8bc4213) into msm-4.4"
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; } } |