Merge tag 'vfio-v4.11-rc1' of git://github.com/awilliam/linux-vfio

[sfrench/cifs-2.6.git] / include / linux / netdev_features.h

diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h
index 9c6c8ef2e9e704513cc4272b0a3ee2fec6809d46..9a0419594e842ca00a5ecfca53823b38bad207bb 100644 (file)
--- a/include/linux/netdev_features.h
+++ b/include/linux/netdev_features.h
@@ -71,7 +71,6 @@ enum {
        NETIF_F_HW_VLAN_STAG_RX_BIT,    /* Receive VLAN STAG HW acceleration */
        NETIF_F_HW_VLAN_STAG_FILTER_BIT,/* Receive filtering on VLAN STAGs */
        NETIF_F_HW_L2FW_DOFFLOAD_BIT,   /* Allow L2 Forwarding in Hardware */
-       NETIF_F_BUSY_POLL_BIT,          /* Busy poll */
 
        NETIF_F_HW_TC_BIT,              /* Offload TC infrastructure */
 
@@ -134,7 +133,6 @@ enum {
 #define NETIF_F_HW_VLAN_STAG_RX        __NETIF_F(HW_VLAN_STAG_RX)
 #define NETIF_F_HW_VLAN_STAG_TX        __NETIF_F(HW_VLAN_STAG_TX)
 #define NETIF_F_HW_L2FW_DOFFLOAD       __NETIF_F(HW_L2FW_DOFFLOAD)
-#define NETIF_F_BUSY_POLL      __NETIF_F(BUSY_POLL)
 #define NETIF_F_HW_TC          __NETIF_F(HW_TC)
 
 #define for_each_netdev_feature(mask_addr, bit)        \