s390/qeth: remove RX VLAN filter stubs in L3 driver

The callbacks have been slimmed down to a level where they no longer do
any actual work. So stop pretending that we support the
NETIF_F_HW_VLAN_CTAG_FILTER feature.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index dd441eaec66eb0ccc19fcbc3d5368faed152de25..35b42275a06c2d09672aff63a38b3d46d5e12b32 100644 (file)
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -1123,24 +1123,6 @@ out:
        return 0;
 }
 
-static int qeth_l3_vlan_rx_add_vid(struct net_device *dev,
-                                  __be16 proto, u16 vid)
-{
-       struct qeth_card *card = dev->ml_priv;
-
-       QETH_CARD_TEXT_(card, 4, "aid:%d", vid);
-       return 0;
-}
-
-static int qeth_l3_vlan_rx_kill_vid(struct net_device *dev,
-                                   __be16 proto, u16 vid)
-{
-       struct qeth_card *card = dev->ml_priv;
-
-       QETH_CARD_TEXT_(card, 4, "kid:%d", vid);
-       return 0;
-}
-
 static void qeth_l3_set_promisc_mode(struct qeth_card *card)
 {
        bool enable = card->dev->flags & IFF_PROMISC;
@@ -1861,8 +1843,6 @@ static const struct net_device_ops qeth_l3_netdev_ops = {
        .ndo_do_ioctl           = qeth_do_ioctl,
        .ndo_fix_features       = qeth_fix_features,
        .ndo_set_features       = qeth_set_features,
-       .ndo_vlan_rx_add_vid    = qeth_l3_vlan_rx_add_vid,
-       .ndo_vlan_rx_kill_vid   = qeth_l3_vlan_rx_kill_vid,
        .ndo_tx_timeout         = qeth_tx_timeout,
 };
 
@@ -1878,8 +1858,6 @@ static const struct net_device_ops qeth_l3_osa_netdev_ops = {
        .ndo_do_ioctl           = qeth_do_ioctl,
        .ndo_fix_features       = qeth_fix_features,
        .ndo_set_features       = qeth_set_features,
-       .ndo_vlan_rx_add_vid    = qeth_l3_vlan_rx_add_vid,
-       .ndo_vlan_rx_kill_vid   = qeth_l3_vlan_rx_kill_vid,
        .ndo_tx_timeout         = qeth_tx_timeout,
        .ndo_neigh_setup        = qeth_l3_neigh_setup,
 };
@@ -1933,8 +1911,7 @@ static int qeth_l3_setup_netdev(struct qeth_card *card)
 
        card->dev->needed_headroom = headroom;
        card->dev->features |=  NETIF_F_HW_VLAN_CTAG_TX |
-                               NETIF_F_HW_VLAN_CTAG_RX |
-                               NETIF_F_HW_VLAN_CTAG_FILTER;
+                               NETIF_F_HW_VLAN_CTAG_RX;
 
        netif_keep_dst(card->dev);
        if (card->dev->hw_features & (NETIF_F_TSO | NETIF_F_TSO6))