diff options
| author | David S. Miller <davem@davemloft.net> | 2013-12-11 06:50:06 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-11 06:50:06 +0400 |
| commit | 22a93216140e5097e8d9d2f99784cfd1c6158ee6 (patch) | |
| tree | fca3967a7e708dea3b42ee80b26e9deabe0be57f /include/linux | |
| parent | 94a12b15e4c575e0aa0ba5e24a4f213163a823d0 (diff) | |
| parent | ad6c81359fc3e6086d1d6f91acda9d5d0e64b2c3 (diff) | |
| download | linux-22a93216140e5097e8d9d2f99784cfd1c6158ee6.tar.xz | |
Merge branch 'ifla_flags'
Jiri Pirko says:
====================
add support for IFA_FLAGS nl attribute
As this was recently added for ipv6, add it for the rest of occurences
as requested by DaveM.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/inetdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h index ae174ca565c9..562e5c7c5d35 100644 --- a/include/linux/inetdevice.h +++ b/include/linux/inetdevice.h @@ -136,8 +136,8 @@ struct in_ifaddr { __be32 ifa_mask; __be32 ifa_broadcast; unsigned char ifa_scope; - unsigned char ifa_flags; unsigned char ifa_prefixlen; + __u32 ifa_flags; char ifa_label[IFNAMSIZ]; /* In seconds, relative to tstamp. Expiry is at tstamp + HZ * lft. */ |