net: make vlan ndo_vlan_rx_[add/kill]_vid return error value

Let caller know the result of adding/removing vlan id to/from vlan
filter.

In some drivers I make those functions to just return 0. But in those
where there is able to see if hw setup went correctly, return value is
set appropriately.

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

2 files changed, 30 insertions, 18 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 823f845ddc04..69b8e4ef14d9 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -97,8 +97,8 @@ static int qlcnicvf_config_bridged_mode(struct qlcnic_adapter *, u32);
 static int qlcnicvf_start_firmware(struct qlcnic_adapter *);
 static void qlcnic_set_netdev_features(struct qlcnic_adapter *,
                                 struct qlcnic_esw_func_cfg *);
-static void qlcnic_vlan_rx_add(struct net_device *, u16);
-static void qlcnic_vlan_rx_del(struct net_device *, u16);
+static int qlcnic_vlan_rx_add(struct net_device *, u16);
+static int qlcnic_vlan_rx_del(struct net_device *, u16);
 
 /*  PCI Device ID Table  */
 #define ENTRY(device) \
@@ -735,20 +735,22 @@ qlcnic_set_vlan_config(struct qlcnic_adapter *adapter,
                 adapter->pvid = 0;
 }
 
-static void
+static int
 qlcnic_vlan_rx_add(struct net_device *netdev, u16 vid)
 {
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
         set_bit(vid, adapter->vlans);
+        return 0;
 }
 
-static void
+static int
 qlcnic_vlan_rx_del(struct net_device *netdev, u16 vid)
 {
         struct qlcnic_adapter *adapter = netdev_priv(netdev);
 
         qlcnic_restore_indev_addr(netdev, NETDEV_DOWN);
         clear_bit(vid, adapter->vlans);
+        return 0;
 }
 
 static void
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index 1ce4e08037b8..b54898737284 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -2349,56 +2349,66 @@ static int qlge_set_features(struct net_device *ndev,
         return 0;
 }
 
-static void __qlge_vlan_rx_add_vid(struct ql_adapter *qdev, u16 vid)
+static int __qlge_vlan_rx_add_vid(struct ql_adapter *qdev, u16 vid)
 {
         u32 enable_bit = MAC_ADDR_E;
+        int err;
 
-        if (ql_set_mac_addr_reg
-            (qdev, (u8 *) &enable_bit, MAC_ADDR_TYPE_VLAN, vid)) {
+        err = ql_set_mac_addr_reg(qdev, (u8 *) &enable_bit,
+                                  MAC_ADDR_TYPE_VLAN, vid);
+        if (err)
                 netif_err(qdev, ifup, qdev->ndev,
                           "Failed to init vlan address.\n");
-        }
+        return err;
 }
 
-static void qlge_vlan_rx_add_vid(struct net_device *ndev, u16 vid)
+static int qlge_vlan_rx_add_vid(struct net_device *ndev, u16 vid)
 {
         struct ql_adapter *qdev = netdev_priv(ndev);
         int status;
+        int err;
 
         status = ql_sem_spinlock(qdev, SEM_MAC_ADDR_MASK);
         if (status)
-                return;
+                return status;
 
-        __qlge_vlan_rx_add_vid(qdev, vid);
+        err = __qlge_vlan_rx_add_vid(qdev, vid);
         set_bit(vid, qdev->active_vlans);
 
         ql_sem_unlock(qdev, SEM_MAC_ADDR_MASK);
+
+        return err;
 }
 
-static void __qlge_vlan_rx_kill_vid(struct ql_adapter *qdev, u16 vid)
+static int __qlge_vlan_rx_kill_vid(struct ql_adapter *qdev, u16 vid)
 {
         u32 enable_bit = 0;
+        int err;
 
-        if (ql_set_mac_addr_reg
-            (qdev, (u8 *) &enable_bit, MAC_ADDR_TYPE_VLAN, vid)) {
+        err = ql_set_mac_addr_reg(qdev, (u8 *) &enable_bit,
+                                  MAC_ADDR_TYPE_VLAN, vid);
+        if (err)
                 netif_err(qdev, ifup, qdev->ndev,
                           "Failed to clear vlan address.\n");
-        }
+        return err;
 }
 
-static void qlge_vlan_rx_kill_vid(struct net_device *ndev, u16 vid)
+static int qlge_vlan_rx_kill_vid(struct net_device *ndev, u16 vid)
 {
         struct ql_adapter *qdev = netdev_priv(ndev);
         int status;
+        int err;
 
         status = ql_sem_spinlock(qdev, SEM_MAC_ADDR_MASK);
         if (status)
-                return;
+                return status;
 
-        __qlge_vlan_rx_kill_vid(qdev, vid);
+        err = __qlge_vlan_rx_kill_vid(qdev, vid);
         clear_bit(vid, qdev->active_vlans);
 
         ql_sem_unlock(qdev, SEM_MAC_ADDR_MASK);
+
+        return err;
 }
 
 static void qlge_restore_vlan(struct ql_adapter *qdev)