hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arnd Bergmann 2015-11-16 15:04:55 +01:00 committed by Greg Kroah-Hartman
parent 0e1af73dde
commit 491880eb47
9 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/wilc1000/host_interface.c
View File

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

9
drivers/staging/wilc1000/host_interface.h
View File

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

3
drivers/staging/wilc1000/linux_mon.c
View File

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

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

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

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

@ -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)
{

1
drivers/staging/wilc1000/wilc_wfi_cfgoperations.h
View File

@ -103,6 +103,5 @@ void wilc_mgmt_frame_register(struct wiphy *wiphy, struct wireless_dev *wdev,
#define TCP_ACK_FILTER_LINK_SPEED_THRESH 54
#define DEFAULT_LINK_SPEED 72
void wilc_enable_tcp_ack_filter(bool value);
#endif

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

@ -206,6 +206,8 @@ struct WILC_WFI_mon_priv {
struct net_device *real_ndev;
};
int wilc1000_wlan_init(struct net_device *dev, perInterface_wlan_t *p_nic);
extern struct wilc *wilc_dev;
extern struct net_device *WILC_WFI_devs[];
void frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset);

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

@ -1,14 +1,8 @@
#include "wilc_wlan_if.h"
#include "wilc_wlan.h"
#include "wilc_wfi_netdevice.h"
#include "wilc_wlan_cfg.h"
#ifdef WILC_SDIO
extern struct wilc_hif_func wilc_hif_sdio;
#else
extern struct wilc_hif_func wilc_hif_spi;
#endif
u32 wilc_get_chipid(u8 update);
typedef struct {
int quit;
wilc_wlan_io_func_t io_func;

21
drivers/staging/wilc1000/wilc_wlan.h
View File

@ -1,7 +1,10 @@
#ifndef WILC_WLAN_H
#define WILC_WLAN_H
#include <linux/types.h>
#define ISWILC1000(id) ((id & 0xfffff000) == 0x100000 ? 1 : 0)
/********************************************
*
* Mac eth header length
@ -255,6 +258,9 @@ struct wilc_hif_func {
void (*hif_set_default_bus_speed)(void);
};
extern struct wilc_hif_func wilc_hif_spi;
extern struct wilc_hif_func wilc_hif_sdio;
/********************************************
*
* Configuration Structure
@ -276,6 +282,8 @@ struct wilc_cfg_rsp {
u32 seq_no;
};
struct wilc;
int wilc_wlan_firmware_download(const u8 *buffer, u32 buffer_size);
int wilc_wlan_start(void);
int wilc_wlan_stop(void);
@ -291,4 +299,17 @@ int wilc_wlan_cfg_get_val(u32 wid, u8 *buffer, u32 buffer_size);
int wilc_wlan_txq_add_mgmt_pkt(struct net_device *dev, void *priv, u8 *buffer,
u32 buffer_size, wilc_tx_complete_func_t func);
void wilc_chip_sleep_manually(void);
void wilc_enable_tcp_ack_filter(bool value);
int wilc_wlan_get_num_conn_ifcs(void);
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);
int wilc_wlan_set_bssid(struct net_device *wilc_netdev, u8 *pBSSID);
void WILC_WFI_p2p_rx(struct net_device *dev, u8 *buff, u32 size);
extern bool wilc_enable_ps;
#endif