From: Chaehyun Lim Date: Sun, 20 Sep 2015 06:51:15 +0000 (+0900) Subject: staging: wilc1000: remove declaration of WILC_WFI_frame_register X-Git-Tag: firefly_0821_release~176^2~802^2~1830 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=12ec0bd63eb13d1c33fc02112b7ca91d5ebf070b;p=firefly-linux-kernel-4.4.55.git staging: wilc1000: remove declaration of WILC_WFI_frame_register 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 5b9c48abc228..cf277491ac3f 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -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++; diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h index a6145fcaf6d3..c32355597ab2 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.h @@ -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