[PATCH 1/3] staging: wilc1000: remove unnecessary netdev validation check in del_key()

[Ajay.Kathat]

From: Ajay Singh <ajay.kat...@microchip.com>

Removed unnecessary check to compare vif interface with zeroth index
element in vif array. Already the caller takes care of passing the
appropriate netdev handler during the del key operation.

Signed-off-by: Ajay Singh <ajay.kat...@microchip.com>
---
 .../staging/wilc1000/wilc_wfi_cfgoperations.c | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 22f21831649b..a1ca700e045a 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -620,29 +620,26 @@ static int del_key(struct wiphy *wiphy, struct net_device 
*netdev,
                   bool pairwise,
                   const u8 *mac_addr)
 {
-       struct wilc *wl = wiphy_priv(wiphy);
        struct wilc_vif *vif = netdev_priv(netdev);
        struct wilc_priv *priv = &vif->priv;
 
-       if (netdev == wl->vif[0]->ndev) {
-               if (priv->wilc_gtk[key_index]) {
-                       kfree(priv->wilc_gtk[key_index]->key);
-                       priv->wilc_gtk[key_index]->key = NULL;
-                       kfree(priv->wilc_gtk[key_index]->seq);
-                       priv->wilc_gtk[key_index]->seq = NULL;
+       if (priv->wilc_gtk[key_index]) {
+               kfree(priv->wilc_gtk[key_index]->key);
+               priv->wilc_gtk[key_index]->key = NULL;
+               kfree(priv->wilc_gtk[key_index]->seq);
+               priv->wilc_gtk[key_index]->seq = NULL;
 
-                       kfree(priv->wilc_gtk[key_index]);
-                       priv->wilc_gtk[key_index] = NULL;
-               }
+               kfree(priv->wilc_gtk[key_index]);
+               priv->wilc_gtk[key_index] = NULL;
+       }
 
-               if (priv->wilc_ptk[key_index]) {
-                       kfree(priv->wilc_ptk[key_index]->key);
-                       priv->wilc_ptk[key_index]->key = NULL;
-                       kfree(priv->wilc_ptk[key_index]->seq);
-                       priv->wilc_ptk[key_index]->seq = NULL;
-                       kfree(priv->wilc_ptk[key_index]);
-                       priv->wilc_ptk[key_index] = NULL;
-               }
+       if (priv->wilc_ptk[key_index]) {
+               kfree(priv->wilc_ptk[key_index]->key);
+               priv->wilc_ptk[key_index]->key = NULL;
+               kfree(priv->wilc_ptk[key_index]->seq);
+               priv->wilc_ptk[key_index]->seq = NULL;
+               kfree(priv->wilc_ptk[key_index]);
+               priv->wilc_ptk[key_index] = NULL;
        }
 
        if (key_index <= 3 && priv->wep_key_len[key_index]) {
-- 
2.22.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel