mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 13:53:33 +00:00
Code Issues Releases Wiki Activity

staging: wilc1000: remove declaration of WILC_WFI_frame_register

Browse source 
This patch removes function declaration of WILC_WFI_frame_register in
linux_wlan.c file, then adds it in wilc_wfi_cfgoperations.h file.

The compilation warning occurs because it is assigned to incorrect
pointer type of second parameter of WILC_WFI_frame_register.
It is assigned with struct wireless_dev pointer type.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chaehyun Lim 2015-09-20 15:51:15 +09:00 committed by Greg Kroah-Hartman
parent a5a45ba273
commit 12ec0bd63e
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/staging/wilc1000/linux_wlan.c
View file

@ -1400,9 +1400,6 @@ int mac_init_fn(struct net_device *ndev)
return 0;
}
void WILC_WFI_frame_register(struct wiphy *wiphy, struct net_device *dev,
u16 frame_type, bool reg);
/* This fn is called, when this device is setup using ifconfig */
int mac_open(struct net_device *ndev)
{
@ -1464,9 +1461,9 @@ int mac_open(struct net_device *ndev)
goto _err_;
}
WILC_WFI_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy, nic->wilc_netdev,
WILC_WFI_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy, nic->wilc_netdev->ieee80211_ptr,
nic->g_struct_frame_reg[0].frame_type, nic->g_struct_frame_reg[0].reg);
WILC_WFI_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy, nic->wilc_netdev,
WILC_WFI_frame_register(nic->wilc_netdev->ieee80211_ptr->wiphy, nic->wilc_netdev->ieee80211_ptr,
nic->g_struct_frame_reg[1].frame_type, nic->g_struct_frame_reg[1].reg);
netif_wake_queue(ndev);
g_linux_wlan->open_ifcs++;

2
drivers/staging/wilc1000/wilc_wfi_cfgoperations.h
View file

@ -100,6 +100,8 @@ int wilc_init_host_int(struct net_device *net);
void WILC_WFI_monitor_rx(u8 *buff, u32 size);
int WILC_WFI_deinit_mon_interface(void);
struct net_device *WILC_WFI_init_mon_interface(const char *name, struct net_device *real_dev);
void WILC_WFI_frame_register(struct wiphy *wiphy, struct wireless_dev *wdev,
u16 frame_type, bool reg);
#define TCP_ACK_FILTER_LINK_SPEED_THRESH 54
#define DEFAULT_LINK_SPEED 72