net: kill long time unused bonding private flags

We don't use them for years, just kill them now.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 6656a43c072dbd4ef164da4d76de3b57286933f4..88a00694eda5fc394bf4e1ef52ac1d51b9f02111 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1240,13 +1240,8 @@ struct net_device_ops {
  *
  * @IFF_802_1Q_VLAN: 802.1Q VLAN device
  * @IFF_EBRIDGE: Ethernet bridging device
- * @IFF_SLAVE_INACTIVE: bonding slave not the curr. active
- * @IFF_MASTER_8023AD: bonding master, 802.3ad
- * @IFF_MASTER_ALB: bonding master, balance-alb
  * @IFF_BONDING: bonding master or slave
- * @IFF_SLAVE_NEEDARP: need ARPs for validation
  * @IFF_ISATAP: ISATAP interface (RFC4214)
- * @IFF_MASTER_ARPMON: bonding master, ARP mon in use
  * @IFF_WAN_HDLC: WAN HDLC device
  * @IFF_XMIT_DST_RELEASE: dev_hard_start_xmit() is allowed to
  *     release skb->dst
@@ -1269,43 +1264,33 @@ struct net_device_ops {
 enum netdev_priv_flags {
        IFF_802_1Q_VLAN                 = 1<<0,
        IFF_EBRIDGE                     = 1<<1,
-       IFF_SLAVE_INACTIVE              = 1<<2,
-       IFF_MASTER_8023AD               = 1<<3,
-       IFF_MASTER_ALB                  = 1<<4,
-       IFF_BONDING                     = 1<<5,
-       IFF_SLAVE_NEEDARP               = 1<<6,
-       IFF_ISATAP                      = 1<<7,
-       IFF_MASTER_ARPMON               = 1<<8,
-       IFF_WAN_HDLC                    = 1<<9,
-       IFF_XMIT_DST_RELEASE            = 1<<10,
-       IFF_DONT_BRIDGE                 = 1<<11,
-       IFF_DISABLE_NETPOLL             = 1<<12,
-       IFF_MACVLAN_PORT                = 1<<13,
-       IFF_BRIDGE_PORT                 = 1<<14,
-       IFF_OVS_DATAPATH                = 1<<15,
-       IFF_TX_SKB_SHARING              = 1<<16,
-       IFF_UNICAST_FLT                 = 1<<17,
-       IFF_TEAM_PORT                   = 1<<18,
-       IFF_SUPP_NOFCS                  = 1<<19,
-       IFF_LIVE_ADDR_CHANGE            = 1<<20,
-       IFF_MACVLAN                     = 1<<21,
-       IFF_XMIT_DST_RELEASE_PERM       = 1<<22,
-       IFF_IPVLAN_MASTER               = 1<<23,
-       IFF_IPVLAN_SLAVE                = 1<<24,
-       IFF_VRF_MASTER                  = 1<<25,
-       IFF_NO_QUEUE                    = 1<<26,
-       IFF_OPENVSWITCH                 = 1<<27,
+       IFF_BONDING                     = 1<<2,
+       IFF_ISATAP                      = 1<<3,
+       IFF_WAN_HDLC                    = 1<<4,
+       IFF_XMIT_DST_RELEASE            = 1<<5,
+       IFF_DONT_BRIDGE                 = 1<<6,
+       IFF_DISABLE_NETPOLL             = 1<<7,
+       IFF_MACVLAN_PORT                = 1<<8,
+       IFF_BRIDGE_PORT                 = 1<<9,
+       IFF_OVS_DATAPATH                = 1<<10,
+       IFF_TX_SKB_SHARING              = 1<<11,
+       IFF_UNICAST_FLT                 = 1<<12,
+       IFF_TEAM_PORT                   = 1<<13,
+       IFF_SUPP_NOFCS                  = 1<<14,
+       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_VRF_MASTER                  = 1<<20,
+       IFF_NO_QUEUE                    = 1<<21,
+       IFF_OPENVSWITCH                 = 1<<22,
 };
 
 #define IFF_802_1Q_VLAN                        IFF_802_1Q_VLAN
 #define IFF_EBRIDGE                    IFF_EBRIDGE
-#define IFF_SLAVE_INACTIVE             IFF_SLAVE_INACTIVE
-#define IFF_MASTER_8023AD              IFF_MASTER_8023AD
-#define IFF_MASTER_ALB                 IFF_MASTER_ALB
 #define IFF_BONDING                    IFF_BONDING
-#define IFF_SLAVE_NEEDARP              IFF_SLAVE_NEEDARP
 #define IFF_ISATAP                     IFF_ISATAP
-#define IFF_MASTER_ARPMON              IFF_MASTER_ARPMON
 #define IFF_WAN_HDLC                   IFF_WAN_HDLC
 #define IFF_XMIT_DST_RELEASE           IFF_XMIT_DST_RELEASE
 #define IFF_DONT_BRIDGE                        IFF_DONT_BRIDGE