Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89febb21 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: replaces g_struct_frame_reg with frame_reg 



This patch replaces g_struct_frame_reg with frame_reg.

Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c92a869e

drivers/staging/wilc1000/linux_wlan.c

+6 −6
Original line number Diff line number Diff line
@@ -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);

}

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

drivers/staging/wilc1000/wilc_wfi_netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -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];