net: unpollute priv_flags space

the ipvlan device driver defines and uses 2 bits inside the priv_flags
net_device field. Such bits and the related helper are used only
inside the ipvlan device driver, and the core networking does not
need to be aware of them.

This change moves netif_is_ipvlan* helper in the ipvlan driver and
re-implement them looking for ipvlan specific symbols instead of
using priv_flags.

Overall this frees two bits inside priv_flags - and move the following
ones to avoid gaps - without any intended functional change.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipvlan/ipvlan.h b/drivers/net/ipvlan/ipvlan.h
index a115f12bf130f75d67a80eb208dce893425db6e1..c818b9bdab6ee2b291cf5f31927f97a39b015c95 100644 (file)
--- a/drivers/net/ipvlan/ipvlan.h
+++ b/drivers/net/ipvlan/ipvlan.h
@@ -177,4 +177,10 @@ int ipvlan_link_new(struct net *src_net, struct net_device *dev,
 void ipvlan_link_delete(struct net_device *dev, struct list_head *head);
 void ipvlan_link_setup(struct net_device *dev);
 int ipvlan_link_register(struct rtnl_link_ops *ops);
+
+static inline bool netif_is_ipvlan_port(const struct net_device *dev)
+{
+       return dev->rx_handler == ipvlan_handle_frame;
+}
+
 #endif /* __IPVLAN_H */

diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index 4cbe9e27287d95e33d745c6551d3af26601578ae..23fd5ab180e8450d8359979e626fe95305a688b5 100644 (file)
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -129,7 +129,6 @@ static int ipvlan_port_create(struct net_device *dev)
        if (err)
                goto err;
 
-       dev->priv_flags |= IFF_IPVLAN_MASTER;
        return 0;
 
 err:
@@ -142,7 +141,6 @@ static void ipvlan_port_destroy(struct net_device *dev)
        struct ipvl_port *port = ipvlan_port_get_rtnl(dev);
        struct sk_buff *skb;
 
-       dev->priv_flags &= ~IFF_IPVLAN_MASTER;
        if (port->mode == IPVLAN_MODE_L3S) {
                dev->priv_flags &= ~IFF_L3MDEV_MASTER;
                ipvlan_unregister_nf_hook(dev_net(dev));
@@ -423,6 +421,12 @@ static const struct header_ops ipvlan_header_ops = {
        .cache_update   = eth_header_cache_update,
 };
 
+static bool netif_is_ipvlan(const struct net_device *dev)
+{
+       /* both ipvlan and ipvtap devices use the same netdev_ops */
+       return dev->netdev_ops == &ipvlan_netdev_ops;
+}
+
 static int ipvlan_ethtool_get_link_ksettings(struct net_device *dev,
                                             struct ethtool_link_ksettings *cmd)
 {
@@ -600,8 +604,6 @@ int ipvlan_link_new(struct net *src_net, struct net_device *dev,
         */
        memcpy(dev->dev_addr, phy_dev->dev_addr, ETH_ALEN);
 
-       dev->priv_flags |= IFF_IPVLAN_SLAVE;
-
        err = register_netdevice(dev);
        if (err < 0)
                return err;

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index dbe6344b727ac60cdc6bf85a38632a1a5a6f890d..95a613a7cc1c8fdcea1678825e8535b21f124222 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1381,8 +1381,6 @@ struct net_device_ops {
  * @IFF_MACVLAN: Macvlan device
  * @IFF_XMIT_DST_RELEASE_PERM: IFF_XMIT_DST_RELEASE not taking into account
  *     underlying stacked devices
- * @IFF_IPVLAN_MASTER: IPvlan master device
- * @IFF_IPVLAN_SLAVE: IPvlan slave device
  * @IFF_L3MDEV_MASTER: device is an L3 master device
  * @IFF_NO_QUEUE: device can run without qdisc attached
  * @IFF_OPENVSWITCH: device is a Open vSwitch master
@@ -1412,16 +1410,14 @@ enum netdev_priv_flags {
        IFF_LIVE_ADDR_CHANGE            = 1<<15,
        IFF_MACVLAN                     = 1<<16,
        IFF_XMIT_DST_RELEASE_PERM       = 1<<17,
-       IFF_IPVLAN_MASTER               = 1<<18,
-       IFF_IPVLAN_SLAVE                = 1<<19,
-       IFF_L3MDEV_MASTER               = 1<<20,
-       IFF_NO_QUEUE                    = 1<<21,
-       IFF_OPENVSWITCH                 = 1<<22,
-       IFF_L3MDEV_SLAVE                = 1<<23,
-       IFF_TEAM                        = 1<<24,
-       IFF_RXFH_CONFIGURED             = 1<<25,
-       IFF_PHONY_HEADROOM              = 1<<26,
-       IFF_MACSEC                      = 1<<27,
+       IFF_L3MDEV_MASTER               = 1<<18,
+       IFF_NO_QUEUE                    = 1<<19,
+       IFF_OPENVSWITCH                 = 1<<20,
+       IFF_L3MDEV_SLAVE                = 1<<21,
+       IFF_TEAM                        = 1<<22,
+       IFF_RXFH_CONFIGURED             = 1<<23,
+       IFF_PHONY_HEADROOM              = 1<<24,
+       IFF_MACSEC                      = 1<<25,
 };
 
 #define IFF_802_1Q_VLAN                        IFF_802_1Q_VLAN
@@ -1442,8 +1438,6 @@ enum netdev_priv_flags {
 #define IFF_LIVE_ADDR_CHANGE           IFF_LIVE_ADDR_CHANGE
 #define IFF_MACVLAN                    IFF_MACVLAN
 #define IFF_XMIT_DST_RELEASE_PERM      IFF_XMIT_DST_RELEASE_PERM
-#define IFF_IPVLAN_MASTER              IFF_IPVLAN_MASTER
-#define IFF_IPVLAN_SLAVE               IFF_IPVLAN_SLAVE
 #define IFF_L3MDEV_MASTER              IFF_L3MDEV_MASTER
 #define IFF_NO_QUEUE                   IFF_NO_QUEUE
 #define IFF_OPENVSWITCH                        IFF_OPENVSWITCH
@@ -4223,16 +4217,6 @@ static inline bool netif_is_macvlan_port(const struct net_device *dev)
        return dev->priv_flags & IFF_MACVLAN_PORT;
 }
 
-static inline bool netif_is_ipvlan(const struct net_device *dev)
-{
-       return dev->priv_flags & IFF_IPVLAN_SLAVE;
-}
-
-static inline bool netif_is_ipvlan_port(const struct net_device *dev)
-{
-       return dev->priv_flags & IFF_IPVLAN_MASTER;
-}
-
 static inline bool netif_is_bond_master(const struct net_device *dev)
 {
        return dev->flags & IFF_MASTER && dev->priv_flags & IFF_BONDING;