leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: wilc1000: replaces g_struct_frame_reg with frame_reg

Browse Source 
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>
This commit is contained in:
Leo Kim 2016-03-25 21:16:49 +09:00 committed by Greg Kroah-Hartman
parent c92a869e61
commit 89febb21c4
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/wilc1000/linux_wlan.c
View File

@ -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);
}

8
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
View File

@ -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;

2
drivers/staging/wilc1000/wilc_wfi_netdevice.h
View File

@ -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];