diff options
| author | David Ahern <dsa@cumulusnetworks.com> | 2015-09-30 03:07:10 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-30 03:40:32 (GMT) |
| commit | 007979eaf94d1c888d8c7cf8a5250c2c6c9bd98e (patch) | |
| tree | 9e3bcaa3104caa24e17c3e2bac8f1d4e4415c996 /include/net/vrf.h | |
| parent | e6934f3ec00b04234acb24a1a2c28af59763d3b5 (diff) | |
| download | linux-007979eaf94d1c888d8c7cf8a5250c2c6c9bd98e.tar.xz | |
net: Rename IFF_VRF_MASTER to IFF_L3MDEV_MASTER
Rename IFF_VRF_MASTER to IFF_L3MDEV_MASTER and update the name of the
netif_is_vrf and netif_index_is_vrf macros.
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/vrf.h')
| -rw-r--r-- | include/net/vrf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/vrf.h b/include/net/vrf.h index 593e609..34bb3f6 100644 --- a/include/net/vrf.h +++ b/include/net/vrf.h @@ -43,7 +43,7 @@ static inline int vrf_master_ifindex_rcu(const struct net_device *dev) if (!dev) return 0; - if (netif_is_vrf(dev)) { + if (netif_is_l3_master(dev)) { ifindex = dev->ifindex; } else { vrf_ptr = rcu_dereference(dev->vrf_ptr); @@ -125,7 +125,7 @@ static inline u32 vrf_dev_table_rtnl(const struct net_device *dev) return tb_id; } -/* caller has already checked netif_is_vrf(dev) */ +/* caller has already checked netif_is_l3_master(dev) */ static inline struct rtable *vrf_dev_get_rth(const struct net_device *dev) { struct rtable *rth = ERR_PTR(-ENETUNREACH); |