4 files changed, 2 insertions, 155 deletions

diff --git a/drivers/net/ethernet/ti/keystone_ethss.c b/drivers/net/ethernet/ti/keystone_ethss.c
index dd3dc51ac8f..e2aebf708dc 100644
--- a/drivers/net/ethernet/ti/keystone_ethss.c
+++ b/drivers/net/ethernet/ti/keystone_ethss.c
@@ -565,7 +565,6 @@ struct cpsw_intf {
         struct list_head         cpsw_intf_list;
         struct timer_list        timer;
         u32                      sgmii_link;
-        unsigned long            active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
 };
 
 static struct cpsw_priv *global_priv;           /* FIXME: REMOVE THIS!! */
@@ -2363,51 +2362,30 @@ static void cpsw_slave_init(struct cpsw_slave *slave, struct cpsw_priv *priv)
 static void cpsw_add_mcast_addr(struct cpsw_intf *cpsw_intf, u8 *addr)
 {
         struct cpsw_priv *cpsw_dev = cpsw_intf->cpsw_priv;
-        u16 vlan_id;
 
         cpsw_ale_add_mcast(cpsw_dev->ale, addr, CPSW_MASK_ALL_PORTS, 0, 0,
                            ALE_MCAST_FWD_2);
-        for_each_set_bit(vlan_id, cpsw_intf->active_vlans, VLAN_N_VID) {
-                cpsw_ale_add_mcast(cpsw_dev->ale, addr, CPSW_MASK_ALL_PORTS,
-                                   ALE_VLAN, vlan_id, ALE_MCAST_FWD_2);
-        }
 }
 
 static void cpsw_add_ucast_addr(struct cpsw_intf *cpsw_intf, u8 *addr)
 {
         struct cpsw_priv *cpsw_dev = cpsw_intf->cpsw_priv;
-        u16 vlan_id;
 
         cpsw_ale_add_ucast(cpsw_dev->ale, addr, cpsw_dev->host_port, 0, 0);
-
-        for_each_set_bit(vlan_id, cpsw_intf->active_vlans, VLAN_N_VID)
-                cpsw_ale_add_ucast(cpsw_dev->ale, addr, cpsw_dev->host_port,
-                                   ALE_VLAN, vlan_id);
 }
 
 static void cpsw_del_mcast_addr(struct cpsw_intf *cpsw_intf, u8 *addr)
 {
         struct cpsw_priv *cpsw_dev = cpsw_intf->cpsw_priv;
-        u16 vlan_id;
 
         cpsw_ale_del_mcast(cpsw_dev->ale, addr, 0, 0, 0);
-
-        for_each_set_bit(vlan_id, cpsw_intf->active_vlans, VLAN_N_VID) {
-                cpsw_ale_del_mcast(cpsw_dev->ale, addr, 0, ALE_VLAN, vlan_id);
-        }
 }
 
 static void cpsw_del_ucast_addr(struct cpsw_intf *cpsw_intf, u8 *addr)
 {
         struct cpsw_priv *cpsw_dev = cpsw_intf->cpsw_priv;
-        u16 vlan_id;
 
         cpsw_ale_del_ucast(cpsw_dev->ale, addr, cpsw_dev->host_port, 0, 0);
-
-        for_each_set_bit(vlan_id, cpsw_intf->active_vlans, VLAN_N_VID) {
-                cpsw_ale_del_ucast(cpsw_dev->ale, addr, cpsw_dev->host_port,
-                                   ALE_VLAN, vlan_id);
-        }
 }
 
 int cpsw_add_addr(void *intf_priv, struct netcp_addr *naddr)
@@ -2462,32 +2440,6 @@ int cpsw_del_addr(void *intf_priv, struct netcp_addr *naddr)
         return 0;
 }
 
-int cpsw_add_vid(void *intf_priv, int vid)
-{
-        struct cpsw_intf *cpsw_intf = intf_priv;
-        struct cpsw_priv *cpsw_dev = cpsw_intf->cpsw_priv;
-
-        set_bit(vid, cpsw_intf->active_vlans);
-
-        cpsw_ale_add_vlan(cpsw_dev->ale, vid, CPSW_MASK_ALL_PORTS,
-                          CPSW_MASK_NO_PORTS,
-                          CPSW_MASK_ALL_PORTS, CPSW_MASK_PHYS_PORTS);
-
-        return 0;
-}
-
-int cpsw_del_vid(void *intf_priv, int vid)
-{
-        struct cpsw_intf *cpsw_intf = intf_priv;
-        struct cpsw_priv *cpsw_dev = cpsw_intf->cpsw_priv;
-
-        cpsw_ale_del_vlan(cpsw_dev->ale, vid, 0);
-
-        clear_bit(vid, cpsw_intf->active_vlans);
-
-        return 0;
-}
-
 #ifdef CONFIG_TI_CPTS
 #define KEYSTONE_PTP_FILTER \
 { \
@@ -3730,8 +3682,6 @@ static struct netcp_module cpsw_module = {
         .release        = cpsw_release,
         .add_addr       = cpsw_add_addr,
         .del_addr       = cpsw_del_addr,
-        .add_vid        = cpsw_add_vid,
-        .del_vid        = cpsw_del_vid,
         .ioctl          = cpsw_ioctl,
 };
 
diff --git a/drivers/net/ethernet/ti/keystone_ethss2.c b/drivers/net/ethernet/ti/keystone_ethss2.c
index 5560d6e2c00..5f2c64f56c4 100644
--- a/drivers/net/ethernet/ti/keystone_ethss2.c
+++ b/drivers/net/ethernet/ti/keystone_ethss2.c
@@ -913,7 +913,6 @@ struct cpsw2_intf {
         struct list_head         cpsw_intf_list;
         struct timer_list        timer;
         u32                      sgmii_link;
-        unsigned long            active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
 };
 
 struct cpsw2_attribute {
@@ -2725,53 +2724,31 @@ static void cpsw2_slave_init(struct cpsw2_slave *slave, struct cpsw2_priv *priv)
 static void cpsw2_add_mcast_addr(struct cpsw2_intf *cpsw_intf, u8 *addr)
 {
         struct cpsw2_priv *cpsw_dev = cpsw_intf->cpsw_priv;
-        u16 vlan_id;
 
         cpsw_ale_add_mcast(cpsw_dev->ale, addr,
                            CPSW2_MASK_ALL_PORTS(cpsw_dev->num_slaves + 1), 0, 0,
                            ALE_MCAST_FWD_2);
-        for_each_set_bit(vlan_id, cpsw_intf->active_vlans, VLAN_N_VID) {
-                cpsw_ale_add_mcast(cpsw_dev->ale, addr,
-                                CPSW2_MASK_ALL_PORTS(cpsw_dev->num_slaves + 1),
-                                ALE_VLAN, vlan_id, ALE_MCAST_FWD_2);
-        }
 }
 
 static void cpsw2_add_ucast_addr(struct cpsw2_intf *cpsw_intf, u8 *addr)
 {
         struct cpsw2_priv *cpsw_dev = cpsw_intf->cpsw_priv;
-        u16 vlan_id;
 
         cpsw_ale_add_ucast(cpsw_dev->ale, addr, cpsw_dev->host_port, 0, 0);
-
-        for_each_set_bit(vlan_id, cpsw_intf->active_vlans, VLAN_N_VID)
-                cpsw_ale_add_ucast(cpsw_dev->ale, addr, cpsw_dev->host_port,
-                                   ALE_VLAN, vlan_id);
 }
 
 static void cpsw2_del_mcast_addr(struct cpsw2_intf *cpsw_intf, u8 *addr)
 {
         struct cpsw2_priv *cpsw_dev = cpsw_intf->cpsw_priv;
-        u16 vlan_id;
 
         cpsw_ale_del_mcast(cpsw_dev->ale, addr, 0, 0, 0);
-
-        for_each_set_bit(vlan_id, cpsw_intf->active_vlans, VLAN_N_VID) {
-                cpsw_ale_del_mcast(cpsw_dev->ale, addr, 0, ALE_VLAN, vlan_id);
-        }
 }
 
 static void cpsw2_del_ucast_addr(struct cpsw2_intf *cpsw_intf, u8 *addr)
 {
         struct cpsw2_priv *cpsw_dev = cpsw_intf->cpsw_priv;
-        u16 vlan_id;
 
         cpsw_ale_del_ucast(cpsw_dev->ale, addr, cpsw_dev->host_port, 0, 0);
-
-        for_each_set_bit(vlan_id, cpsw_intf->active_vlans, VLAN_N_VID) {
-                cpsw_ale_del_ucast(cpsw_dev->ale, addr, cpsw_dev->host_port,
-                                   ALE_VLAN, vlan_id);
-        }
 }
 
 static int cpsw2_add_addr(void *intf_priv, struct netcp_addr *naddr)
@@ -2826,34 +2803,6 @@ static int cpsw2_del_addr(void *intf_priv, struct netcp_addr *naddr)
         return 0;
 }
 
-static int cpsw2_add_vid(void *intf_priv, int vid)
-{
-        struct cpsw2_intf *cpsw_intf = intf_priv;
-        struct cpsw2_priv *cpsw_dev = cpsw_intf->cpsw_priv;
-
-        set_bit(vid, cpsw_intf->active_vlans);
-
-        cpsw_ale_add_vlan(cpsw_dev->ale, vid,
-                          CPSW2_MASK_ALL_PORTS(cpsw_dev->num_slaves + 1),
-                          CPSW2_MASK_NO_PORTS,
-                          CPSW2_MASK_ALL_PORTS(cpsw_dev->num_slaves + 1),
-                          CPSW2_MASK_PHYS_PORTS(cpsw_dev->num_slaves + 1));
-
-        return 0;
-}
-
-static int cpsw2_del_vid(void *intf_priv, int vid)
-{
-        struct cpsw2_intf *cpsw_intf = intf_priv;
-        struct cpsw2_priv *cpsw_dev = cpsw_intf->cpsw_priv;
-
-        cpsw_ale_del_vlan(cpsw_dev->ale, vid, 0);
-
-        clear_bit(vid, cpsw_intf->active_vlans);
-
-        return 0;
-}
-
 #ifdef CONFIG_TI_CPTS
 #define KEYSTONE_PTP_FILTER2 \
 { \
@@ -4101,8 +4050,6 @@ static struct netcp_module cpsw_module = {
         .release        = cpsw2_release,
         .add_addr       = cpsw2_add_addr,
         .del_addr       = cpsw2_del_addr,
-        .add_vid        = cpsw2_add_vid,
-        .del_vid        = cpsw2_del_vid,
         .ioctl          = cpsw2_ioctl,
 };
 
diff --git a/drivers/net/ethernet/ti/keystone_net_core.c b/drivers/net/ethernet/ti/keystone_net_core.c
index 47efc9223d1..56c3493a72a 100644
--- a/drivers/net/ethernet/ti/keystone_net_core.c
+++ b/drivers/net/ethernet/ti/keystone_net_core.c
@@ -1752,7 +1752,7 @@ static int netcp_rx_add_vid(struct net_device *ndev, __be16 proto, u16 vid)
         unsigned long flags;
         int err = 0;
 
-        dev_info(netcp->dev, "adding rx vlan id: %d\n", vid);
+        dev_dbg(netcp->dev, "adding rx vlan id: %d\n", vid);
 
         spin_lock_irqsave(&netcp->lock, flags);
 
@@ -1780,7 +1780,7 @@ static int netcp_rx_kill_vid(struct net_device *ndev, __be16 proto, u16 vid)
         struct netcp_module *module;
         int err = 0;
 
-        dev_info(netcp->dev, "removing rx vlan id: %d\n", vid);
+        dev_dbg(netcp->dev, "removing rx vlan id: %d\n", vid);
 
         for_each_module(netcp, intf_modpriv) {
                 module = intf_modpriv->netcp_module;
diff --git a/drivers/net/ethernet/ti/keystone_xgess.c b/drivers/net/ethernet/ti/keystone_xgess.c
index e683d591016..a09de9044d2 100644
--- a/drivers/net/ethernet/ti/keystone_xgess.c
+++ b/drivers/net/ethernet/ti/keystone_xgess.c
@@ -319,7 +319,6 @@ struct cpswx_intf {
         struct list_head         cpsw_intf_list;
         struct timer_list        timer;
         u32                      sgmii_link;
-        unsigned long            active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
 };
 
 /*
@@ -1784,51 +1783,30 @@ static void cpsw_slave_init(struct cpswx_slave *slave, struct cpswx_priv *priv)
 static void cpsw_add_mcast_addr(struct cpswx_intf *cpsw_intf, u8 *addr)
 {
         struct cpswx_priv *cpsw_dev = cpsw_intf->cpsw_priv;
-        u16 vlan_id;
 
         cpsw_ale_add_mcast(cpsw_dev->ale, addr, CPSW_MASK_ALL_PORTS, 0, 0,
                            ALE_MCAST_FWD_2);
-        for_each_set_bit(vlan_id, cpsw_intf->active_vlans, VLAN_N_VID) {
-                cpsw_ale_add_mcast(cpsw_dev->ale, addr, CPSW_MASK_ALL_PORTS,
-                                   ALE_VLAN, vlan_id, ALE_MCAST_FWD_2);
-        }
 }
 
 static void cpsw_add_ucast_addr(struct cpswx_intf *cpsw_intf, u8 *addr)
 {
         struct cpswx_priv *cpsw_dev = cpsw_intf->cpsw_priv;
-        u16 vlan_id;
 
         cpsw_ale_add_ucast(cpsw_dev->ale, addr, cpsw_dev->host_port, 0, 0);
-
-        for_each_set_bit(vlan_id, cpsw_intf->active_vlans, VLAN_N_VID)
-                cpsw_ale_add_ucast(cpsw_dev->ale, addr, cpsw_dev->host_port,
-                                   ALE_VLAN, vlan_id);
 }
 
 static void cpsw_del_mcast_addr(struct cpswx_intf *cpsw_intf, u8 *addr)
 {
         struct cpswx_priv *cpsw_dev = cpsw_intf->cpsw_priv;
-        u16 vlan_id;
 
         cpsw_ale_del_mcast(cpsw_dev->ale, addr, 0, 0, 0);
-
-        for_each_set_bit(vlan_id, cpsw_intf->active_vlans, VLAN_N_VID) {
-                cpsw_ale_del_mcast(cpsw_dev->ale, addr, 0, ALE_VLAN, vlan_id);
-        }
 }
 
 static void cpsw_del_ucast_addr(struct cpswx_intf *cpsw_intf, u8 *addr)
 {
         struct cpswx_priv *cpsw_dev = cpsw_intf->cpsw_priv;
-        u16 vlan_id;
 
         cpsw_ale_del_ucast(cpsw_dev->ale, addr, cpsw_dev->host_port, 0, 0);
-
-        for_each_set_bit(vlan_id, cpsw_intf->active_vlans, VLAN_N_VID) {
-                cpsw_ale_del_ucast(cpsw_dev->ale, addr, cpsw_dev->host_port,
-                                   ALE_VLAN, vlan_id);
-        }
 }
 
 static int cpswx_add_addr(void *intf_priv, struct netcp_addr *naddr)
@@ -1883,32 +1861,6 @@ static int cpswx_del_addr(void *intf_priv, struct netcp_addr *naddr)
         return 0;
 }
 
-static int cpswx_add_vid(void *intf_priv, int vid)
-{
-        struct cpswx_intf *cpsw_intf = intf_priv;
-        struct cpswx_priv *cpsw_dev = cpsw_intf->cpsw_priv;
-
-        set_bit(vid, cpsw_intf->active_vlans);
-
-        cpsw_ale_add_vlan(cpsw_dev->ale, vid, CPSW_MASK_ALL_PORTS,
-                          CPSW_MASK_NO_PORTS,
-                          CPSW_MASK_ALL_PORTS, CPSW_MASK_PHYS_PORTS);
-
-        return 0;
-}
-
-static int cpswx_del_vid(void *intf_priv, int vid)
-{
-        struct cpswx_intf *cpsw_intf = intf_priv;
-        struct cpswx_priv *cpsw_dev = cpsw_intf->cpsw_priv;
-
-        cpsw_ale_del_vlan(cpsw_dev->ale, vid, 0);
-
-        clear_bit(vid, cpsw_intf->active_vlans);
-
-        return 0;
-}
-
 static int cpswx_ioctl(void *intf_priv, struct ifreq *req, int cmd)
 {
         struct cpswx_intf *cpsw_intf = intf_priv;
@@ -2583,8 +2535,6 @@ static struct netcp_module cpsw_module = {
         .release        = cpswx_release,
         .add_addr       = cpswx_add_addr,
         .del_addr       = cpswx_del_addr,
-        .add_vid        = cpswx_add_vid,
-        .del_vid        = cpswx_del_vid,
         .ioctl          = cpswx_ioctl,
 };