Merge ath-next from ath.git

[firefly-linux-kernel-4.4.55.git] / net / ipv6 / raw.c

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 8072bd4139b7576a797bdebd6c3c5b75c8412582..ca4700cb26c4feec258c8e5034389522125b113e 100644 (file)
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -865,6 +865,9 @@ static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
                fl6.flowi6_oif = np->ucast_oif;
        security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
 
+       if (inet->hdrincl)
+               fl6.flowi6_flags |= FLOWI_FLAG_KNOWN_NH;
+
        dst = ip6_dst_lookup_flow(sk, &fl6, final_p);
        if (IS_ERR(dst)) {
                err = PTR_ERR(dst);
@@ -1324,13 +1327,7 @@ static struct inet_protosw rawv6_protosw = {
 
 int __init rawv6_init(void)
 {
-       int ret;
-
-       ret = inet6_register_protosw(&rawv6_protosw);
-       if (ret)
-               goto out;
-out:
-       return ret;
+       return inet6_register_protosw(&rawv6_protosw);
 }
 
 void rawv6_exit(void)