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

Commit 491880eb authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

staging/wilc1000: move extern declarations to headers 



'extern' declarations belong into a header file rather than
a .c file, to ensure that the definition matches the declaration.

This moves all declarations into a header file that seems
most appropriate for it.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0e1af73d

drivers/staging/wilc1000/host_interface.c

+1 −8
Original line number Diff line number Diff line
@@ -4,17 +4,12 @@ 
#include <linux/delay.h>

#include "host_interface.h"

#include "coreconfigurator.h"

#include "wilc_wlan.h"

#include "wilc_wlan_if.h"

#include "wilc_msgqueue.h"

#include <linux/etherdevice.h>

#include "wilc_wfi_netdevice.h"



extern u8 wilc_connecting;



extern struct timer_list wilc_during_ip_timer;



extern u8 wilc_initialized;



#define HOST_IF_MSG_SCAN                        0

#define HOST_IF_MSG_CONNECT                     1

#define HOST_IF_MSG_RCVD_GNRL_ASYNC_INFO        2
@@ -271,8 +266,6 @@ static struct host_if_drv *join_req_drv; 


static void *host_int_ParseJoinBssParam(tstrNetworkInfo *ptstrNetworkInfo);



extern int wilc_wlan_get_num_conn_ifcs(void);



static int add_handler_in_list(struct host_if_drv *handler)

{

	int i;

drivers/staging/wilc1000/host_interface.h

+9 −0
Original line number Diff line number Diff line
@@ -394,4 +394,13 @@ void wilc_free_join_params(void *pJoinParams); 
s32 wilc_get_statistics(struct host_if_drv *hWFIDrv,

			    struct rf_info *pstrStatistics);

void wilc_resolve_disconnect_aberration(struct host_if_drv *hif_drv);



extern bool wilc_optaining_ip;

extern u8 wilc_connected_SSID[6];

extern u8 wilc_multicast_mac_addr_list[WILC_MULTICAST_TABLE_SIZE][ETH_ALEN];



extern int wilc_connecting;

extern u8 wilc_initialized;

extern struct timer_list wilc_during_ip_timer;



#endif

drivers/staging/wilc1000/linux_mon.c

+0 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ struct wilc_wfi_radiotap_cb_hdr { 


static struct net_device *wilc_wfi_mon; /* global monitor netdev */



extern int  wilc_mac_xmit(struct sk_buff *skb, struct net_device *dev);





static u8 srcAdd[6];

static u8 bssid[6];

static u8 broadcast[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};

drivers/staging/wilc1000/linux_wlan.c

+0 −9
Original line number Diff line number Diff line
@@ -37,10 +37,6 @@ 
 #define _linux_wlan_device_detection()		{}

 #define _linux_wlan_device_removal()		{}



extern bool wilc_optaining_ip;

extern u8 wilc_multicast_mac_addr_list[WILC_MULTICAST_TABLE_SIZE][ETH_ALEN];

extern struct timer_list wilc_during_ip_timer;



static int linux_wlan_device_power(int on_off)

{

	PRINT_D(INIT_DBG, "linux_wlan_device_power.. (%d)\n", on_off);
@@ -81,14 +77,9 @@ static struct semaphore close_exit_sync; 


static int wlan_deinit_locks(struct net_device *dev);

static void wlan_deinitialize_threads(struct net_device *dev);

extern void WILC_WFI_monitor_rx(u8 *buff, u32 size);

extern void WILC_WFI_p2p_rx(struct net_device *dev, u8 *buff, u32 size);



static void linux_wlan_tx_complete(void *priv, int status);

static int  mac_init_fn(struct net_device *ndev);

int  wilc_mac_xmit(struct sk_buff *skb, struct net_device *dev);

int  wilc_mac_open(struct net_device *ndev);

int  wilc_mac_close(struct net_device *ndev);

static struct net_device_stats *mac_stats(struct net_device *dev);

static int  mac_ioctl(struct net_device *ndev, struct ifreq *req, int cmd);

static void wilc_set_multicast_list(struct net_device *dev);

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+1 −5
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#ifdef WILC_SDIO

#include "linux_wlan_sdio.h"

#endif

#include "host_interface.h"

#include <linux/errno.h>



#define IS_MANAGMEMENT				0x100
@@ -29,10 +30,8 @@ static u32 u32LastScannedNtwrksCountShadow; 
struct timer_list wilc_during_ip_timer;

static struct timer_list hAgingTimer;

static u8 op_ifcs;

extern u8 wilc_connected_SSID[6];



u8 wilc_initialized = 1;

extern bool wilc_optaining_ip;



#define CHAN2G(_channel, _freq, _flags) {	 \

		.band             = IEEE80211_BAND_2GHZ, \
@@ -2149,7 +2148,6 @@ static int cancel_remain_on_channel(struct wiphy *wiphy, 
 *  @date	01 JUL 2012

 *  @version

 */

extern bool wilc_enable_ps;

static int mgmt_tx(struct wiphy *wiphy,

		   struct wireless_dev *wdev,

		   struct cfg80211_mgmt_tx_params *params,
@@ -2484,8 +2482,6 @@ static int set_power_mgmt(struct wiphy *wiphy, struct net_device *dev, 
 *  @date	01 MAR 2012

 *  @version	1.0

 */

int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic);



static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,

			       enum nl80211_iftype type, u32 *flags, struct vif_params *params)

{