Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus

[firefly-linux-kernel-4.4.55.git] / include / linux / icmpv6.h

diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h
index e4d4300d768fd6fdef3bf76195969b31da8f77f9..a93a8dd33118f5fe900e2e6a2e79672bdb1f1319 100644 (file)
--- a/include/linux/icmpv6.h
+++ b/include/linux/icmpv6.h
@@ -40,16 +40,18 @@ struct icmp6hdr {
                 struct icmpv6_nd_ra {
                        __u8            hop_limit;
 #if defined(__LITTLE_ENDIAN_BITFIELD)
-                       __u8            reserved:4,
+                       __u8            reserved:3,
                                        router_pref:2,
+                                       home_agent:1,
                                        other:1,
                                        managed:1;
 
 #elif defined(__BIG_ENDIAN_BITFIELD)
                        __u8            managed:1,
                                        other:1,
+                                       home_agent:1,
                                        router_pref:2,
-                                       reserved:4;
+                                       reserved:3;
 #else
 #error "Please fix <asm/byteorder.h>"
 #endif
@@ -184,6 +186,7 @@ extern void                         icmpv6_param_prob(struct sk_buff *skb,
                                                          int code, int pos);
 
 struct flowi;
+struct in6_addr;
 extern void                            icmpv6_flow_init(struct sock *sk,
                                                         struct flowi *fl,
                                                         u8 type,