staging: wilc1000: replaces frame_type with type of struct frame_reg

This patch replaces frame_type with type of struct frame_reg.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 2f830cd3163bca902cb19ac14f5d1219c8504f40..760d44d170568e27d1eac0391c86db36cd090af0 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -966,11 +966,11 @@ int wilc_mac_open(struct net_device *ndev)
 
        wilc_mgmt_frame_register(vif->ndev->ieee80211_ptr->wiphy,
                                 vif->ndev->ieee80211_ptr,
-                                vif->frame_reg[0].frame_type,
+                                vif->frame_reg[0].type,
                                 vif->frame_reg[0].reg);
        wilc_mgmt_frame_register(vif->ndev->ieee80211_ptr->wiphy,
                                 vif->ndev->ieee80211_ptr,
-                                vif->frame_reg[1].frame_type,
+                                vif->frame_reg[1].type,
                                 vif->frame_reg[1].reg);
        netif_wake_queue(ndev);
        wl->open_ifcs++;
@@ -1260,8 +1260,8 @@ void WILC_WFI_mgmt_rx(struct wilc *wilc, u8 *buff, u32 size)
        }
 
        vif = netdev_priv(wilc->vif[1]->ndev);
-       if ((buff[0] == vif->frame_reg[0].frame_type && vif->frame_reg[0].reg) ||
-           (buff[0] == vif->frame_reg[1].frame_type && vif->frame_reg[1].reg))
+       if ((buff[0] == vif->frame_reg[0].type && vif->frame_reg[0].reg) ||
+           (buff[0] == vif->frame_reg[1].type && vif->frame_reg[1].reg))
                WILC_WFI_p2p_rx(wilc->vif[1]->ndev, buff, size);
 }
 

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 3e0ffee894161ba9e8f66d43c51446da7e65e1d1..5785dda8f9d392e35123450b200bc455ebdd81b7 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1745,14 +1745,14 @@ void wilc_mgmt_frame_register(struct wiphy *wiphy, struct wireless_dev *wdev,
        switch (frame_type) {
        case PROBE_REQ:
        {
-               vif->frame_reg[0].frame_type = frame_type;
+               vif->frame_reg[0].type = frame_type;
                vif->frame_reg[0].reg = reg;
        }
        break;
 
        case ACTION:
        {
-               vif->frame_reg[1].frame_type = frame_type;
+               vif->frame_reg[1].type = frame_type;
                vif->frame_reg[1].reg = reg;
        }
        break;

diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 3abe48188d3d3f8a5b9af08d26473da4fb6f4ad3..debb139b7687444966b80885e5669c7f1d7b6cbc 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -140,7 +140,7 @@ struct wilc_priv {
 };
 
 struct frame_reg {
-       u16 frame_type;
+       u16 type;
        bool reg;
 };