From: Leo Kim <leo.kim@atmel.com>
Date: Fri, 25 Mar 2016 12:16:50 +0000 (+0900)
Subject: staging: wilc1000: replaces frame_type with type of struct frame_reg
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=340a84ff96c4d9effbc841a085e2101c3977e5cf;p=openwrt%2Fstaging%2Fblogic.git

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 2f830cd3163b..760d44d17056 100644
--- 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 3e0ffee89416..5785dda8f9d3 100644
--- 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 3abe48188d3d..debb139b7687 100644
--- 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;
 };