diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-03-21 10:16:54 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-03-21 10:16:54 -0700 |
| commit | 28b18b39c5a7df75ff657bd9e09f3b8091651e61 (patch) | |
| tree | 2abf4b6c8087a0daec60320bb46b029918f276b4 /include | |
| parent | net/tls: Replace kfree_skb() with consume_skb() (diff) | |
| parent | ipv6: Change addrconf_f6i_alloc to use ip6_route_info_create (diff) | |
Merge branch 'ipv6-Change-addrconf_f6i_alloc-to-use-ip6_route_info_create'
David Ahern says:
====================
ipv6: Change addrconf_f6i_alloc to use ip6_route_info_create
addrconf_f6i_alloc is the last caller of fib6_info_alloc besides
ip6_route_info_create. There really is no good reason for it do
its own fib6_info initialization, so convert it to call
ip6_route_info_create.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ip6_fib.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 84097010237c..2acb78a762ee 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -50,7 +50,8 @@ struct fib6_config { u32 fc_protocol; u16 fc_type; /* only 8 bits are used */ u16 fc_delete_all_nh : 1, - __unused : 15; + fc_ignore_dev_down:1, + __unused : 14; struct in6_addr fc_dst; struct in6_addr fc_src; |