summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2013-12-06 09:45:21 +0100
committerDavid S. Miller <davem@davemloft.net>2013-12-06 16:34:43 -0500
commit479840ffdbe4242e8a25349218c8e0859223aa35 (patch)
treecad6833e9f0b92949c3dc1568b790877e18ffafa /include/net
parente6247027e5173c00efb2084d688d06ff835bc3b0 (diff)
downloadblackbird-op-linux-479840ffdbe4242e8a25349218c8e0859223aa35.tar.gz
blackbird-op-linux-479840ffdbe4242e8a25349218c8e0859223aa35.zip
ipv6 addrconf: extend ifa_flags to u32
There is no more space in u8 ifa_flags. So do what davem suffested and add another netlink attr called IFA_FLAGS for carry more flags. Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: Thomas Haller <thaller@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/addrconf.h4
-rw-r--r--include/net/if_inet6.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 86505bfa5d2c..e70278eef12a 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -81,9 +81,9 @@ int ipv6_dev_get_saddr(struct net *net, const struct net_device *dev,
const struct in6_addr *daddr, unsigned int srcprefs,
struct in6_addr *saddr);
int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
- unsigned char banned_flags);
+ u32 banned_flags);
int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
- unsigned char banned_flags);
+ u32 banned_flags);
int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2);
void addrconf_join_solict(struct net_device *dev, const struct in6_addr *addr);
void addrconf_leave_solict(struct inet6_dev *idev, const struct in6_addr *addr);
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 76d54270f2e2..b58c36c1c3f6 100644
--- 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;
OpenPOWER on IntegriCloud