staging: wilc1000: replaces g_struct_frame_reg with frame_reg

This patch replaces g_struct_frame_reg with 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 e949f218885c484bb0bba8243f995d9e11e86d97..2f830cd3163bca902cb19ac14f5d1219c8504f40 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -966,12 +966,12 @@ int wilc_mac_open(struct net_device *ndev)
 
        wilc_mgmt_frame_register(vif->ndev->ieee80211_ptr->wiphy,
                                 vif->ndev->ieee80211_ptr,
-                                vif->g_struct_frame_reg[0].frame_type,
-                                vif->g_struct_frame_reg[0].reg);
+                                vif->frame_reg[0].frame_type,
+                                vif->frame_reg[0].reg);
        wilc_mgmt_frame_register(vif->ndev->ieee80211_ptr->wiphy,
                                 vif->ndev->ieee80211_ptr,
-                                vif->g_struct_frame_reg[1].frame_type,
-                                vif->g_struct_frame_reg[1].reg);
+                                vif->frame_reg[1].frame_type,
+                                vif->frame_reg[1].reg);
        netif_wake_queue(ndev);
        wl->open_ifcs++;
        vif->mac_opened = 1;
@@ -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->g_struct_frame_reg[0].frame_type && vif->g_struct_frame_reg[0].reg) ||
-           (buff[0] == vif->g_struct_frame_reg[1].frame_type && vif->g_struct_frame_reg[1].reg))
+       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))
                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 70625f8a2e3c35f2d1f766e02461744f7960f9c5..3e0ffee894161ba9e8f66d43c51446da7e65e1d1 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1745,15 +1745,15 @@ void wilc_mgmt_frame_register(struct wiphy *wiphy, struct wireless_dev *wdev,
        switch (frame_type) {
        case PROBE_REQ:
        {
-               vif->g_struct_frame_reg[0].frame_type = frame_type;
-               vif->g_struct_frame_reg[0].reg = reg;
+               vif->frame_reg[0].frame_type = frame_type;
+               vif->frame_reg[0].reg = reg;
        }
        break;
 
        case ACTION:
        {
-               vif->g_struct_frame_reg[1].frame_type = frame_type;
-               vif->g_struct_frame_reg[1].reg = reg;
+               vif->frame_reg[1].frame_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 f394484a1cebf932ffa910ef8c382a6601b80380..3abe48188d3d3f8a5b9af08d26473da4fb6f4ad3 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -149,7 +149,7 @@ struct wilc_vif {
        u8 iftype;
        int monitor_flag;
        int mac_opened;
-       struct frame_reg g_struct_frame_reg[num_reg_frame];
+       struct frame_reg frame_reg[num_reg_frame];
        struct net_device_stats netstats;
        struct wilc *wilc;
        u8 src_addr[ETH_ALEN];