diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-01-15 17:00:47 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-15 17:00:47 -0800 |
| commit | e5d640239fbb3a543b6151d49656b7573b940fdf (patch) | |
| tree | a1487e383ad39c19412bd2c3c3fa3a91f4f3963a /include | |
| parent | Revert "batman-adv: drop dependency against CRC16" (diff) | |
| parent | ipv6 addrconf: don't cleanup prefix route for IFA_F_NOPREFIXROUTE (diff) | |
Merge branch 'noprefixroute'
Thomas Haller says:
====================
ipv6 addrconf: add IFA_F_NOPREFIXROUTE flag to suppress creation of IP6 routes
v1 -> v2: add a second commit, handling NOPREFIXROUTE in ip6_del_addr.
v2 -> v3: reword commit messages, code comments and some refactoring.
v3 -> v4: refactor, rename variables, add enum
v4 -> v5: rebase, so that patch applies cleanly to current net-next/master
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/if_addr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/if_addr.h b/include/uapi/linux/if_addr.h index cfed10be7529..dea10a87dfd1 100644 --- a/include/uapi/linux/if_addr.h +++ b/include/uapi/linux/if_addr.h @@ -49,6 +49,7 @@ enum { #define IFA_F_TENTATIVE 0x40 #define IFA_F_PERMANENT 0x80 #define IFA_F_MANAGETEMPADDR 0x100 +#define IFA_F_NOPREFIXROUTE 0x200 struct ifa_cacheinfo { __u32 ifa_prefered; |