rocker: remove support for legacy VLAN ndo ops

Remove support for legacy ndo ops
.ndo_vlan_rx_add_vid/.ndo_vlan_rx_kill_vid.  Rocker will use
bridge_setlink/dellink exclusively for VLAN add/del operations.

The legacy ops are needed if using 8021q driver module to setup VLANs on
the port.  But an alternative exists in using bridge_setlink/delink to
setup VLANs, which doesn't depend on 8021q module.  So rocker will switch
to the newer setlink/dellink ops.  VLANs can added/delete from the port,
regardless if port is bridged or not, using the bridge commands:

	bridge vlan [add|del] vid VID dev DEV self

(Yes, I agree it's confusing to use the "bridge" command to set a VLAN on a
non-bridged port).

Using setlink/dellink over legacy ops let's us handle the stacked driver
case automatically.  It's built-in.  setlink also pass additional flags
(PVID, egress untagged) that aren't available with the legacy ops.

Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 357f55d4e466d79f8e273f99a97ec14d4ccaa9bd..819289e5be4f726c13ce30c5c5d8df2f45e6a32a 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -4164,35 +4164,6 @@ static int rocker_port_set_mac_address(struct net_device *dev, void *p)
        return 0;
 }
 
-static int rocker_port_vlan_rx_add_vid(struct net_device *dev,
-                                      __be16 proto, u16 vid)
-{
-       struct rocker_port *rocker_port = netdev_priv(dev);
-       int err;
-
-       err = rocker_port_vlan(rocker_port, SWITCHDEV_TRANS_NONE, 0, vid);
-       if (err)
-               return err;
-
-       return rocker_port_router_mac(rocker_port, SWITCHDEV_TRANS_NONE,
-                                     0, htons(vid));
-}
-
-static int rocker_port_vlan_rx_kill_vid(struct net_device *dev,
-                                       __be16 proto, u16 vid)
-{
-       struct rocker_port *rocker_port = netdev_priv(dev);
-       int err;
-
-       err = rocker_port_router_mac(rocker_port, SWITCHDEV_TRANS_NONE,
-                                    ROCKER_OP_FLAG_REMOVE, htons(vid));
-       if (err)
-               return err;
-
-       return rocker_port_vlan(rocker_port, SWITCHDEV_TRANS_NONE,
-                               ROCKER_OP_FLAG_REMOVE, vid);
-}
-
 static int rocker_port_get_phys_port_name(struct net_device *dev,
                                          char *buf, size_t len)
 {
@@ -4213,8 +4184,6 @@ static const struct net_device_ops rocker_port_netdev_ops = {
        .ndo_stop                       = rocker_port_stop,
        .ndo_start_xmit                 = rocker_port_xmit,
        .ndo_set_mac_address            = rocker_port_set_mac_address,
-       .ndo_vlan_rx_add_vid            = rocker_port_vlan_rx_add_vid,
-       .ndo_vlan_rx_kill_vid           = rocker_port_vlan_rx_kill_vid,
        .ndo_bridge_getlink             = switchdev_port_bridge_getlink,
        .ndo_bridge_setlink             = switchdev_port_bridge_setlink,
        .ndo_bridge_dellink             = switchdev_port_bridge_dellink,
@@ -4883,8 +4852,7 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number)
                       NAPI_POLL_WEIGHT);
        rocker_carrier_init(rocker_port);
 
-       dev->features |= NETIF_F_NETNS_LOCAL |
-                        NETIF_F_HW_VLAN_CTAG_FILTER;
+       dev->features |= NETIF_F_NETNS_LOCAL;
 
        err = register_netdev(dev);
        if (err) {