Merge branch 'for-3.14' of git://linux-nfs.org/~bfields/linux

[~andy/linux] / include / net / if_inet6.h

diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 65bb13035598fe141afd52a101f99ed1c9fd6838..9650a3ffd2d2328f11859adc4a3169ae41b25442 100644 (file)
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -50,8 +50,8 @@ struct inet6_ifaddr {
 
        int                     state;
 
+       __u32                   flags;
        __u8                    dad_probes;
-       __u8                    flags;
 
        __u16                   scope;