mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-25 11:55:37 +00:00
staging: wilc1000: add 'wilc_' prefix to have proper namespace
Cleanup patch to rename data structure and function name to have 'wilc_' prefix. Signed-off-by: Ajay Singh <ajay.kathat@microchip.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
dda037057a
commit
f5436edeed
8 changed files with 61 additions and 61 deletions
|
@ -9,7 +9,7 @@
|
||||||
#define WILC_HIF_SCAN_TIMEOUT_MS 4000
|
#define WILC_HIF_SCAN_TIMEOUT_MS 4000
|
||||||
#define WILC_HIF_CONNECT_TIMEOUT_MS 9500
|
#define WILC_HIF_CONNECT_TIMEOUT_MS 9500
|
||||||
|
|
||||||
#define FALSE_FRMWR_CHANNEL 100
|
#define WILC_FALSE_FRMWR_CHANNEL 100
|
||||||
|
|
||||||
struct wilc_rcvd_mac_info {
|
struct wilc_rcvd_mac_info {
|
||||||
u8 status;
|
u8 status;
|
||||||
|
@ -21,7 +21,7 @@ struct wilc_set_multicast {
|
||||||
u8 *mc_list;
|
u8 *mc_list;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct del_all_sta {
|
struct wilc_del_all_sta {
|
||||||
u8 assoc_sta;
|
u8 assoc_sta;
|
||||||
u8 mac[WILC_MAX_NUM_STA][ETH_ALEN];
|
u8 mac[WILC_MAX_NUM_STA][ETH_ALEN];
|
||||||
};
|
};
|
||||||
|
@ -68,16 +68,16 @@ struct wilc_gtk_key {
|
||||||
u8 key[0];
|
u8 key[0];
|
||||||
} __packed;
|
} __packed;
|
||||||
|
|
||||||
union message_body {
|
union wilc_message_body {
|
||||||
struct wilc_rcvd_net_info net_info;
|
struct wilc_rcvd_net_info net_info;
|
||||||
struct wilc_rcvd_mac_info mac_info;
|
struct wilc_rcvd_mac_info mac_info;
|
||||||
struct wilc_set_multicast mc_info;
|
struct wilc_set_multicast mc_info;
|
||||||
struct remain_ch remain_on_ch;
|
struct wilc_remain_ch remain_on_ch;
|
||||||
char *data;
|
char *data;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct host_if_msg {
|
struct host_if_msg {
|
||||||
union message_body body;
|
union wilc_message_body body;
|
||||||
struct wilc_vif *vif;
|
struct wilc_vif *vif;
|
||||||
struct work_struct work;
|
struct work_struct work;
|
||||||
void (*fn)(struct work_struct *ws);
|
void (*fn)(struct work_struct *ws);
|
||||||
|
@ -110,7 +110,7 @@ struct wilc_join_bss_param {
|
||||||
u8 bssid[ETH_ALEN];
|
u8 bssid[ETH_ALEN];
|
||||||
__le16 beacon_period;
|
__le16 beacon_period;
|
||||||
u8 dtim_period;
|
u8 dtim_period;
|
||||||
u8 supp_rates[MAX_RATES_SUPPORTED + 1];
|
u8 supp_rates[WILC_MAX_RATES_SUPPORTED + 1];
|
||||||
u8 wmm_cap;
|
u8 wmm_cap;
|
||||||
u8 uapsd_cap;
|
u8 uapsd_cap;
|
||||||
u8 ht_capable;
|
u8 ht_capable;
|
||||||
|
@ -195,7 +195,7 @@ static int handle_scan_done(struct wilc_vif *vif, enum scan_event evt)
|
||||||
u8 abort_running_scan;
|
u8 abort_running_scan;
|
||||||
struct wid wid;
|
struct wid wid;
|
||||||
struct host_if_drv *hif_drv = vif->hif_drv;
|
struct host_if_drv *hif_drv = vif->hif_drv;
|
||||||
struct user_scan_req *scan_req;
|
struct wilc_user_scan_req *scan_req;
|
||||||
|
|
||||||
if (evt == SCAN_EVENT_ABORTED) {
|
if (evt == SCAN_EVENT_ABORTED) {
|
||||||
abort_running_scan = 1;
|
abort_running_scan = 1;
|
||||||
|
@ -475,8 +475,8 @@ void *wilc_parse_join_bss_param(struct cfg80211_bss *bss,
|
||||||
supp_rates_ie = cfg80211_find_ie(WLAN_EID_EXT_SUPP_RATES, ies->data,
|
supp_rates_ie = cfg80211_find_ie(WLAN_EID_EXT_SUPP_RATES, ies->data,
|
||||||
ies->len);
|
ies->len);
|
||||||
if (supp_rates_ie) {
|
if (supp_rates_ie) {
|
||||||
if (supp_rates_ie[1] > (MAX_RATES_SUPPORTED - rates_len))
|
if (supp_rates_ie[1] > (WILC_MAX_RATES_SUPPORTED - rates_len))
|
||||||
param->supp_rates[0] = MAX_RATES_SUPPORTED;
|
param->supp_rates[0] = WILC_MAX_RATES_SUPPORTED;
|
||||||
else
|
else
|
||||||
param->supp_rates[0] += supp_rates_ie[1];
|
param->supp_rates[0] += supp_rates_ie[1];
|
||||||
|
|
||||||
|
@ -563,7 +563,7 @@ static void handle_rcvd_ntwrk_info(struct work_struct *work)
|
||||||
{
|
{
|
||||||
struct host_if_msg *msg = container_of(work, struct host_if_msg, work);
|
struct host_if_msg *msg = container_of(work, struct host_if_msg, work);
|
||||||
struct wilc_rcvd_net_info *rcvd_info = &msg->body.net_info;
|
struct wilc_rcvd_net_info *rcvd_info = &msg->body.net_info;
|
||||||
struct user_scan_req *scan_req = &msg->vif->hif_drv->usr_scan_req;
|
struct wilc_user_scan_req *scan_req = &msg->vif->hif_drv->usr_scan_req;
|
||||||
const u8 *ch_elm;
|
const u8 *ch_elm;
|
||||||
u8 *ies;
|
u8 *ies;
|
||||||
int ies_len;
|
int ies_len;
|
||||||
|
@ -758,7 +758,7 @@ int wilc_disconnect(struct wilc_vif *vif)
|
||||||
{
|
{
|
||||||
struct wid wid;
|
struct wid wid;
|
||||||
struct host_if_drv *hif_drv = vif->hif_drv;
|
struct host_if_drv *hif_drv = vif->hif_drv;
|
||||||
struct user_scan_req *scan_req;
|
struct wilc_user_scan_req *scan_req;
|
||||||
struct wilc_conn_info *conn_info;
|
struct wilc_conn_info *conn_info;
|
||||||
int result;
|
int result;
|
||||||
u16 dummy_reason_code = 0;
|
u16 dummy_reason_code = 0;
|
||||||
|
@ -911,7 +911,7 @@ static void wilc_hif_pack_sta_param(u8 *cur_byte, const u8 *mac,
|
||||||
}
|
}
|
||||||
|
|
||||||
static int handle_remain_on_chan(struct wilc_vif *vif,
|
static int handle_remain_on_chan(struct wilc_vif *vif,
|
||||||
struct remain_ch *hif_remain_ch)
|
struct wilc_remain_ch *hif_remain_ch)
|
||||||
{
|
{
|
||||||
int result;
|
int result;
|
||||||
u8 remain_on_chan_flag;
|
u8 remain_on_chan_flag;
|
||||||
|
@ -957,7 +957,7 @@ static void handle_listen_state_expired(struct work_struct *work)
|
||||||
{
|
{
|
||||||
struct host_if_msg *msg = container_of(work, struct host_if_msg, work);
|
struct host_if_msg *msg = container_of(work, struct host_if_msg, work);
|
||||||
struct wilc_vif *vif = msg->vif;
|
struct wilc_vif *vif = msg->vif;
|
||||||
struct remain_ch *hif_remain_ch = &msg->body.remain_on_ch;
|
struct wilc_remain_ch *hif_remain_ch = &msg->body.remain_on_ch;
|
||||||
u8 remain_on_chan_flag;
|
u8 remain_on_chan_flag;
|
||||||
struct wid wid;
|
struct wid wid;
|
||||||
int result;
|
int result;
|
||||||
|
@ -975,7 +975,7 @@ static void handle_listen_state_expired(struct work_struct *work)
|
||||||
goto free_msg;
|
goto free_msg;
|
||||||
|
|
||||||
wid.val[0] = remain_on_chan_flag;
|
wid.val[0] = remain_on_chan_flag;
|
||||||
wid.val[1] = FALSE_FRMWR_CHANNEL;
|
wid.val[1] = WILC_FALSE_FRMWR_CHANNEL;
|
||||||
|
|
||||||
result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1,
|
result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1,
|
||||||
wilc_get_vif_idx(vif));
|
wilc_get_vif_idx(vif));
|
||||||
|
@ -1224,7 +1224,7 @@ int wilc_add_ptk(struct wilc_vif *vif, const u8 *ptk, u8 ptk_key_len,
|
||||||
u8 mode, u8 cipher_mode, u8 index)
|
u8 mode, u8 cipher_mode, u8 index)
|
||||||
{
|
{
|
||||||
int result = 0;
|
int result = 0;
|
||||||
u8 t_key_len = ptk_key_len + RX_MIC_KEY_LEN + TX_MIC_KEY_LEN;
|
u8 t_key_len = ptk_key_len + WILC_RX_MIC_KEY_LEN + WILC_TX_MIC_KEY_LEN;
|
||||||
|
|
||||||
if (mode == WILC_AP_MODE) {
|
if (mode == WILC_AP_MODE) {
|
||||||
struct wid wid_list[2];
|
struct wid wid_list[2];
|
||||||
|
@ -1246,11 +1246,11 @@ int wilc_add_ptk(struct wilc_vif *vif, const u8 *ptk, u8 ptk_key_len,
|
||||||
|
|
||||||
if (rx_mic)
|
if (rx_mic)
|
||||||
memcpy(&key_buf->key[ptk_key_len], rx_mic,
|
memcpy(&key_buf->key[ptk_key_len], rx_mic,
|
||||||
RX_MIC_KEY_LEN);
|
WILC_RX_MIC_KEY_LEN);
|
||||||
|
|
||||||
if (tx_mic)
|
if (tx_mic)
|
||||||
memcpy(&key_buf->key[ptk_key_len + RX_MIC_KEY_LEN],
|
memcpy(&key_buf->key[ptk_key_len + WILC_RX_MIC_KEY_LEN],
|
||||||
tx_mic, TX_MIC_KEY_LEN);
|
tx_mic, WILC_TX_MIC_KEY_LEN);
|
||||||
|
|
||||||
wid_list[1].id = WID_ADD_PTK;
|
wid_list[1].id = WID_ADD_PTK;
|
||||||
wid_list[1].type = WID_STR;
|
wid_list[1].type = WID_STR;
|
||||||
|
@ -1274,11 +1274,11 @@ int wilc_add_ptk(struct wilc_vif *vif, const u8 *ptk, u8 ptk_key_len,
|
||||||
|
|
||||||
if (rx_mic)
|
if (rx_mic)
|
||||||
memcpy(&key_buf->key[ptk_key_len], rx_mic,
|
memcpy(&key_buf->key[ptk_key_len], rx_mic,
|
||||||
RX_MIC_KEY_LEN);
|
WILC_RX_MIC_KEY_LEN);
|
||||||
|
|
||||||
if (tx_mic)
|
if (tx_mic)
|
||||||
memcpy(&key_buf->key[ptk_key_len + RX_MIC_KEY_LEN],
|
memcpy(&key_buf->key[ptk_key_len + WILC_RX_MIC_KEY_LEN],
|
||||||
tx_mic, TX_MIC_KEY_LEN);
|
tx_mic, WILC_TX_MIC_KEY_LEN);
|
||||||
|
|
||||||
wid.id = WID_ADD_PTK;
|
wid.id = WID_ADD_PTK;
|
||||||
wid.type = WID_STR;
|
wid.type = WID_STR;
|
||||||
|
@ -1299,7 +1299,7 @@ int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len,
|
||||||
{
|
{
|
||||||
int result = 0;
|
int result = 0;
|
||||||
struct wilc_gtk_key *gtk_key;
|
struct wilc_gtk_key *gtk_key;
|
||||||
int t_key_len = gtk_key_len + RX_MIC_KEY_LEN + TX_MIC_KEY_LEN;
|
int t_key_len = gtk_key_len + WILC_RX_MIC_KEY_LEN + WILC_TX_MIC_KEY_LEN;
|
||||||
|
|
||||||
gtk_key = kzalloc(sizeof(*gtk_key) + t_key_len, GFP_KERNEL);
|
gtk_key = kzalloc(sizeof(*gtk_key) + t_key_len, GFP_KERNEL);
|
||||||
if (!gtk_key)
|
if (!gtk_key)
|
||||||
|
@ -1317,11 +1317,11 @@ int wilc_add_rx_gtk(struct wilc_vif *vif, const u8 *rx_gtk, u8 gtk_key_len,
|
||||||
memcpy(>k_key->key[0], rx_gtk, gtk_key_len);
|
memcpy(>k_key->key[0], rx_gtk, gtk_key_len);
|
||||||
|
|
||||||
if (rx_mic)
|
if (rx_mic)
|
||||||
memcpy(>k_key->key[gtk_key_len], rx_mic, RX_MIC_KEY_LEN);
|
memcpy(>k_key->key[gtk_key_len], rx_mic, WILC_RX_MIC_KEY_LEN);
|
||||||
|
|
||||||
if (tx_mic)
|
if (tx_mic)
|
||||||
memcpy(>k_key->key[gtk_key_len + RX_MIC_KEY_LEN],
|
memcpy(>k_key->key[gtk_key_len + WILC_RX_MIC_KEY_LEN],
|
||||||
tx_mic, TX_MIC_KEY_LEN);
|
tx_mic, WILC_TX_MIC_KEY_LEN);
|
||||||
|
|
||||||
if (mode == WILC_AP_MODE) {
|
if (mode == WILC_AP_MODE) {
|
||||||
struct wid wid_list[2];
|
struct wid wid_list[2];
|
||||||
|
@ -1819,7 +1819,7 @@ int wilc_remain_on_channel(struct wilc_vif *vif, u64 cookie,
|
||||||
void (*expired)(void *, u64),
|
void (*expired)(void *, u64),
|
||||||
void *user_arg)
|
void *user_arg)
|
||||||
{
|
{
|
||||||
struct remain_ch roc;
|
struct wilc_remain_ch roc;
|
||||||
int result;
|
int result;
|
||||||
|
|
||||||
roc.ch = chan;
|
roc.ch = chan;
|
||||||
|
@ -2017,7 +2017,7 @@ int wilc_del_allstation(struct wilc_vif *vif, u8 mac_addr[][ETH_ALEN])
|
||||||
int result;
|
int result;
|
||||||
int i;
|
int i;
|
||||||
u8 assoc_sta = 0;
|
u8 assoc_sta = 0;
|
||||||
struct del_all_sta del_sta;
|
struct wilc_del_all_sta del_sta;
|
||||||
|
|
||||||
memset(&del_sta, 0x0, sizeof(del_sta));
|
memset(&del_sta, 0x0, sizeof(del_sta));
|
||||||
for (i = 0; i < WILC_MAX_NUM_STA; i++) {
|
for (i = 0; i < WILC_MAX_NUM_STA; i++) {
|
||||||
|
|
|
@ -21,8 +21,8 @@ enum {
|
||||||
#define WILC_MAX_NUM_SCANNED_CH 14
|
#define WILC_MAX_NUM_SCANNED_CH 14
|
||||||
#define WILC_MAX_NUM_PROBED_SSID 10
|
#define WILC_MAX_NUM_PROBED_SSID 10
|
||||||
|
|
||||||
#define TX_MIC_KEY_LEN 8
|
#define WILC_TX_MIC_KEY_LEN 8
|
||||||
#define RX_MIC_KEY_LEN 8
|
#define WILC_RX_MIC_KEY_LEN 8
|
||||||
|
|
||||||
#define WILC_MAX_NUM_PMKIDS 16
|
#define WILC_MAX_NUM_PMKIDS 16
|
||||||
#define WILC_ADD_STA_LENGTH 40
|
#define WILC_ADD_STA_LENGTH 40
|
||||||
|
@ -115,7 +115,7 @@ struct wilc_probe_ssid {
|
||||||
u32 size;
|
u32 size;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct user_scan_req {
|
struct wilc_user_scan_req {
|
||||||
void (*scan_result)(enum scan_event evt,
|
void (*scan_result)(enum scan_event evt,
|
||||||
struct wilc_rcvd_net_info *info, void *priv);
|
struct wilc_rcvd_net_info *info, void *priv);
|
||||||
void *arg;
|
void *arg;
|
||||||
|
@ -137,7 +137,7 @@ struct wilc_conn_info {
|
||||||
void *param;
|
void *param;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct remain_ch {
|
struct wilc_remain_ch {
|
||||||
u16 ch;
|
u16 ch;
|
||||||
u32 duration;
|
u32 duration;
|
||||||
void (*expired)(void *priv, u64 cookie);
|
void (*expired)(void *priv, u64 cookie);
|
||||||
|
@ -147,9 +147,9 @@ struct remain_ch {
|
||||||
|
|
||||||
struct wilc;
|
struct wilc;
|
||||||
struct host_if_drv {
|
struct host_if_drv {
|
||||||
struct user_scan_req usr_scan_req;
|
struct wilc_user_scan_req usr_scan_req;
|
||||||
struct wilc_conn_info conn_info;
|
struct wilc_conn_info conn_info;
|
||||||
struct remain_ch remain_on_ch;
|
struct wilc_remain_ch remain_on_ch;
|
||||||
u64 p2p_timeout;
|
u64 p2p_timeout;
|
||||||
|
|
||||||
enum host_if_state hif_state;
|
enum host_if_state hif_state;
|
||||||
|
|
|
@ -814,7 +814,7 @@ static int wilc_spi_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size)
|
||||||
*
|
*
|
||||||
********************************************/
|
********************************************/
|
||||||
|
|
||||||
static int _wilc_spi_deinit(struct wilc *wilc)
|
static int wilc_spi_deinit(struct wilc *wilc)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* TODO:
|
* TODO:
|
||||||
|
@ -1122,7 +1122,7 @@ static int wilc_spi_sync_ext(struct wilc *wilc, int nint)
|
||||||
/* Global spi HIF function table */
|
/* Global spi HIF function table */
|
||||||
static const struct wilc_hif_func wilc_hif_spi = {
|
static const struct wilc_hif_func wilc_hif_spi = {
|
||||||
.hif_init = wilc_spi_init,
|
.hif_init = wilc_spi_init,
|
||||||
.hif_deinit = _wilc_spi_deinit,
|
.hif_deinit = wilc_spi_deinit,
|
||||||
.hif_read_reg = wilc_spi_read_reg,
|
.hif_read_reg = wilc_spi_read_reg,
|
||||||
.hif_write_reg = wilc_spi_write_reg,
|
.hif_write_reg = wilc_spi_write_reg,
|
||||||
.hif_block_rx = wilc_spi_read,
|
.hif_block_rx = wilc_spi_read,
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#define GAS_INITIAL_REQ 0x0a
|
#define GAS_INITIAL_REQ 0x0a
|
||||||
#define GAS_INITIAL_RSP 0x0b
|
#define GAS_INITIAL_RSP 0x0b
|
||||||
|
|
||||||
#define INVALID_CHANNEL 0
|
#define WILC_INVALID_CHANNEL 0
|
||||||
|
|
||||||
static const struct ieee80211_txrx_stypes
|
static const struct ieee80211_txrx_stypes
|
||||||
wilc_wfi_cfg80211_mgmt_types[NUM_NL80211_IFTYPES] = {
|
wilc_wfi_cfg80211_mgmt_types[NUM_NL80211_IFTYPES] = {
|
||||||
|
@ -62,7 +62,7 @@ static const struct wiphy_wowlan_support wowlan_support = {
|
||||||
.flags = WIPHY_WOWLAN_ANY
|
.flags = WIPHY_WOWLAN_ANY
|
||||||
};
|
};
|
||||||
|
|
||||||
struct p2p_mgmt_data {
|
struct wilc_p2p_mgmt_data {
|
||||||
int size;
|
int size;
|
||||||
u8 *buff;
|
u8 *buff;
|
||||||
};
|
};
|
||||||
|
@ -158,7 +158,7 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt, u8 mac_status,
|
||||||
wilc_wlan_set_bssid(priv->dev, NULL, WILC_STATION_MODE);
|
wilc_wlan_set_bssid(priv->dev, NULL, WILC_STATION_MODE);
|
||||||
|
|
||||||
if (vif->iftype != WILC_CLIENT_MODE)
|
if (vif->iftype != WILC_CLIENT_MODE)
|
||||||
wl->sta_ch = INVALID_CHANNEL;
|
wl->sta_ch = WILC_INVALID_CHANNEL;
|
||||||
|
|
||||||
netdev_err(dev, "Unspecified failure\n");
|
netdev_err(dev, "Unspecified failure\n");
|
||||||
}
|
}
|
||||||
|
@ -184,7 +184,7 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt, u8 mac_status,
|
||||||
wilc_wlan_set_bssid(priv->dev, NULL, WILC_STATION_MODE);
|
wilc_wlan_set_bssid(priv->dev, NULL, WILC_STATION_MODE);
|
||||||
|
|
||||||
if (vif->iftype != WILC_CLIENT_MODE)
|
if (vif->iftype != WILC_CLIENT_MODE)
|
||||||
wl->sta_ch = INVALID_CHANNEL;
|
wl->sta_ch = WILC_INVALID_CHANNEL;
|
||||||
|
|
||||||
if (wfi_drv->ifc_up && dev == wl->vif[1]->ndev)
|
if (wfi_drv->ifc_up && dev == wl->vif[1]->ndev)
|
||||||
reason = 3;
|
reason = 3;
|
||||||
|
@ -446,7 +446,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
|
||||||
netdev_err(dev, "wilc_set_join_req(): Error\n");
|
netdev_err(dev, "wilc_set_join_req(): Error\n");
|
||||||
ret = -ENOENT;
|
ret = -ENOENT;
|
||||||
if (vif->iftype != WILC_CLIENT_MODE)
|
if (vif->iftype != WILC_CLIENT_MODE)
|
||||||
vif->wilc->sta_ch = INVALID_CHANNEL;
|
vif->wilc->sta_ch = WILC_INVALID_CHANNEL;
|
||||||
wilc_wlan_set_bssid(dev, NULL, WILC_STATION_MODE);
|
wilc_wlan_set_bssid(dev, NULL, WILC_STATION_MODE);
|
||||||
wfi_drv->conn_info.conn_result = NULL;
|
wfi_drv->conn_info.conn_result = NULL;
|
||||||
kfree(join_params);
|
kfree(join_params);
|
||||||
|
@ -484,7 +484,7 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vif->iftype != WILC_CLIENT_MODE)
|
if (vif->iftype != WILC_CLIENT_MODE)
|
||||||
wilc->sta_ch = INVALID_CHANNEL;
|
wilc->sta_ch = WILC_INVALID_CHANNEL;
|
||||||
wilc_wlan_set_bssid(priv->dev, NULL, WILC_STATION_MODE);
|
wilc_wlan_set_bssid(priv->dev, NULL, WILC_STATION_MODE);
|
||||||
|
|
||||||
priv->p2p.local_random = 0x01;
|
priv->p2p.local_random = 0x01;
|
||||||
|
@ -974,7 +974,7 @@ static void wilc_wfi_cfg_parse_rx_action(u8 *buf, u32 len, u8 sta_ch)
|
||||||
op_channel_attr_index = index;
|
op_channel_attr_index = index;
|
||||||
index += buf[index + 1] + 3;
|
index += buf[index + 1] + 3;
|
||||||
}
|
}
|
||||||
if (sta_ch != INVALID_CHANNEL)
|
if (sta_ch != WILC_INVALID_CHANNEL)
|
||||||
wilc_wfi_cfg_parse_ch_attr(buf, channel_list_attr_index,
|
wilc_wfi_cfg_parse_ch_attr(buf, channel_list_attr_index,
|
||||||
op_channel_attr_index, sta_ch);
|
op_channel_attr_index, sta_ch);
|
||||||
}
|
}
|
||||||
|
@ -999,7 +999,7 @@ static void wilc_wfi_cfg_parse_tx_action(u8 *buf, u32 len, bool oper_ch,
|
||||||
op_channel_attr_index = index;
|
op_channel_attr_index = index;
|
||||||
index += buf[index + 1] + 3;
|
index += buf[index + 1] + 3;
|
||||||
}
|
}
|
||||||
if (sta_ch != INVALID_CHANNEL && oper_ch)
|
if (sta_ch != WILC_INVALID_CHANNEL && oper_ch)
|
||||||
wilc_wfi_cfg_parse_ch_attr(buf, channel_list_attr_index,
|
wilc_wfi_cfg_parse_ch_attr(buf, channel_list_attr_index,
|
||||||
op_channel_attr_index, sta_ch);
|
op_channel_attr_index, sta_ch);
|
||||||
}
|
}
|
||||||
|
@ -1115,7 +1115,7 @@ void wilc_wfi_p2p_rx(struct net_device *dev, u8 *buff, u32 size)
|
||||||
|
|
||||||
static void wilc_wfi_mgmt_tx_complete(void *priv, int status)
|
static void wilc_wfi_mgmt_tx_complete(void *priv, int status)
|
||||||
{
|
{
|
||||||
struct p2p_mgmt_data *pv_data = priv;
|
struct wilc_p2p_mgmt_data *pv_data = priv;
|
||||||
|
|
||||||
kfree(pv_data->buff);
|
kfree(pv_data->buff);
|
||||||
kfree(pv_data);
|
kfree(pv_data);
|
||||||
|
@ -1189,7 +1189,7 @@ static int cancel_remain_on_channel(struct wiphy *wiphy,
|
||||||
}
|
}
|
||||||
|
|
||||||
static void wilc_wfi_cfg_tx_vendor_spec(struct wilc_priv *priv,
|
static void wilc_wfi_cfg_tx_vendor_spec(struct wilc_priv *priv,
|
||||||
struct p2p_mgmt_data *mgmt_tx,
|
struct wilc_p2p_mgmt_data *mgmt_tx,
|
||||||
struct cfg80211_mgmt_tx_params *params,
|
struct cfg80211_mgmt_tx_params *params,
|
||||||
u8 iftype, u32 buf_len)
|
u8 iftype, u32 buf_len)
|
||||||
{
|
{
|
||||||
|
@ -1249,7 +1249,7 @@ static int mgmt_tx(struct wiphy *wiphy,
|
||||||
const u8 *buf = params->buf;
|
const u8 *buf = params->buf;
|
||||||
size_t len = params->len;
|
size_t len = params->len;
|
||||||
const struct ieee80211_mgmt *mgmt;
|
const struct ieee80211_mgmt *mgmt;
|
||||||
struct p2p_mgmt_data *mgmt_tx;
|
struct wilc_p2p_mgmt_data *mgmt_tx;
|
||||||
struct wilc_priv *priv = wiphy_priv(wiphy);
|
struct wilc_priv *priv = wiphy_priv(wiphy);
|
||||||
struct host_if_drv *wfi_drv = priv->hif_drv;
|
struct host_if_drv *wfi_drv = priv->hif_drv;
|
||||||
struct wilc_vif *vif = netdev_priv(wdev->netdev);
|
struct wilc_vif *vif = netdev_priv(wdev->netdev);
|
||||||
|
|
|
@ -523,7 +523,7 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *txq_count)
|
||||||
if (vmm_sz & 0x3)
|
if (vmm_sz & 0x3)
|
||||||
vmm_sz = (vmm_sz + 4) & ~0x3;
|
vmm_sz = (vmm_sz + 4) & ~0x3;
|
||||||
|
|
||||||
if ((sum + vmm_sz) > LINUX_TX_SIZE)
|
if ((sum + vmm_sz) > WILC_TX_BUFF_SIZE)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
vmm_table[i] = vmm_sz / 4;
|
vmm_table[i] = vmm_sz / 4;
|
||||||
|
@ -811,7 +811,7 @@ static void wilc_wlan_handle_isr_ext(struct wilc *wilc, u32 int_status)
|
||||||
if (size <= 0)
|
if (size <= 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (LINUX_RX_SIZE - offset < size)
|
if (WILC_RX_BUFF_SIZE - offset < size)
|
||||||
offset = 0;
|
offset = 0;
|
||||||
|
|
||||||
buffer = &wilc->rx_buffer[offset];
|
buffer = &wilc->rx_buffer[offset];
|
||||||
|
@ -1314,7 +1314,7 @@ int wilc_wlan_init(struct net_device *dev)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!wilc->tx_buffer)
|
if (!wilc->tx_buffer)
|
||||||
wilc->tx_buffer = kmalloc(LINUX_TX_SIZE, GFP_KERNEL);
|
wilc->tx_buffer = kmalloc(WILC_TX_BUFF_SIZE, GFP_KERNEL);
|
||||||
|
|
||||||
if (!wilc->tx_buffer) {
|
if (!wilc->tx_buffer) {
|
||||||
ret = -ENOBUFS;
|
ret = -ENOBUFS;
|
||||||
|
@ -1322,7 +1322,7 @@ int wilc_wlan_init(struct net_device *dev)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!wilc->rx_buffer)
|
if (!wilc->rx_buffer)
|
||||||
wilc->rx_buffer = kmalloc(LINUX_RX_SIZE, GFP_KERNEL);
|
wilc->rx_buffer = kmalloc(WILC_RX_BUFF_SIZE, GFP_KERNEL);
|
||||||
|
|
||||||
if (!wilc->rx_buffer) {
|
if (!wilc->rx_buffer) {
|
||||||
ret = -ENOBUFS;
|
ret = -ENOBUFS;
|
||||||
|
|
|
@ -131,8 +131,8 @@
|
||||||
#define WILC_PLL_TO_SPI 2
|
#define WILC_PLL_TO_SPI 2
|
||||||
#define ABORT_INT BIT(31)
|
#define ABORT_INT BIT(31)
|
||||||
|
|
||||||
#define LINUX_RX_SIZE (96 * 1024)
|
#define WILC_RX_BUFF_SIZE (96 * 1024)
|
||||||
#define LINUX_TX_SIZE (64 * 1024)
|
#define WILC_TX_BUFF_SIZE (64 * 1024)
|
||||||
|
|
||||||
#define MODALIAS "WILC_SPI"
|
#define MODALIAS "WILC_SPI"
|
||||||
#define GPIO_NUM 0x44
|
#define GPIO_NUM 0x44
|
||||||
|
@ -248,7 +248,7 @@ struct wilc_hif_func {
|
||||||
void (*disable_interrupt)(struct wilc *nic);
|
void (*disable_interrupt)(struct wilc *nic);
|
||||||
};
|
};
|
||||||
|
|
||||||
#define MAX_CFG_FRAME_SIZE 1468
|
#define WILC_MAX_CFG_FRAME_SIZE 1468
|
||||||
|
|
||||||
struct wilc_cfg_cmd_hdr {
|
struct wilc_cfg_cmd_hdr {
|
||||||
u8 cmd_type;
|
u8 cmd_type;
|
||||||
|
@ -259,7 +259,7 @@ struct wilc_cfg_cmd_hdr {
|
||||||
|
|
||||||
struct wilc_cfg_frame {
|
struct wilc_cfg_frame {
|
||||||
struct wilc_cfg_cmd_hdr hdr;
|
struct wilc_cfg_cmd_hdr hdr;
|
||||||
u8 frame[MAX_CFG_FRAME_SIZE];
|
u8 frame[WILC_MAX_CFG_FRAME_SIZE];
|
||||||
};
|
};
|
||||||
|
|
||||||
struct wilc_cfg_rsp {
|
struct wilc_cfg_rsp {
|
||||||
|
|
|
@ -54,7 +54,7 @@ static int wilc_wlan_cfg_set_byte(u8 *frame, u32 offset, u16 id, u8 val8)
|
||||||
{
|
{
|
||||||
u8 *buf;
|
u8 *buf;
|
||||||
|
|
||||||
if ((offset + 4) >= MAX_CFG_FRAME_SIZE)
|
if ((offset + 4) >= WILC_MAX_CFG_FRAME_SIZE)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
buf = &frame[offset];
|
buf = &frame[offset];
|
||||||
|
@ -71,7 +71,7 @@ static int wilc_wlan_cfg_set_hword(u8 *frame, u32 offset, u16 id, u16 val16)
|
||||||
{
|
{
|
||||||
u8 *buf;
|
u8 *buf;
|
||||||
|
|
||||||
if ((offset + 5) >= MAX_CFG_FRAME_SIZE)
|
if ((offset + 5) >= WILC_MAX_CFG_FRAME_SIZE)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
buf = &frame[offset];
|
buf = &frame[offset];
|
||||||
|
@ -90,7 +90,7 @@ static int wilc_wlan_cfg_set_word(u8 *frame, u32 offset, u16 id, u32 val32)
|
||||||
{
|
{
|
||||||
u8 *buf;
|
u8 *buf;
|
||||||
|
|
||||||
if ((offset + 7) >= MAX_CFG_FRAME_SIZE)
|
if ((offset + 7) >= WILC_MAX_CFG_FRAME_SIZE)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
buf = &frame[offset];
|
buf = &frame[offset];
|
||||||
|
@ -112,7 +112,7 @@ static int wilc_wlan_cfg_set_str(u8 *frame, u32 offset, u16 id, u8 *str,
|
||||||
{
|
{
|
||||||
u8 *buf;
|
u8 *buf;
|
||||||
|
|
||||||
if ((offset + size + 4) >= MAX_CFG_FRAME_SIZE)
|
if ((offset + size + 4) >= WILC_MAX_CFG_FRAME_SIZE)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
buf = &frame[offset];
|
buf = &frame[offset];
|
||||||
|
@ -134,7 +134,7 @@ static int wilc_wlan_cfg_set_bin(u8 *frame, u32 offset, u16 id, u8 *b, u32 size)
|
||||||
u32 i;
|
u32 i;
|
||||||
u8 checksum = 0;
|
u8 checksum = 0;
|
||||||
|
|
||||||
if ((offset + size + 5) >= MAX_CFG_FRAME_SIZE)
|
if ((offset + size + 5) >= WILC_MAX_CFG_FRAME_SIZE)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
buf = &frame[offset];
|
buf = &frame[offset];
|
||||||
|
@ -309,7 +309,7 @@ int wilc_wlan_cfg_get_wid(u8 *frame, u32 offset, u16 id)
|
||||||
{
|
{
|
||||||
u8 *buf;
|
u8 *buf;
|
||||||
|
|
||||||
if ((offset + 2) >= MAX_CFG_FRAME_SIZE)
|
if ((offset + 2) >= WILC_MAX_CFG_FRAME_SIZE)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
buf = &frame[offset];
|
buf = &frame[offset];
|
||||||
|
|
|
@ -45,7 +45,7 @@ struct tx_complete_data {
|
||||||
*
|
*
|
||||||
********************************************/
|
********************************************/
|
||||||
#define WILC_MULTICAST_TABLE_SIZE 8
|
#define WILC_MULTICAST_TABLE_SIZE 8
|
||||||
#define MAX_RATES_SUPPORTED 12
|
#define WILC_MAX_RATES_SUPPORTED 12
|
||||||
|
|
||||||
enum bss_types {
|
enum bss_types {
|
||||||
WILC_FW_BSS_TYPE_INFRA = 0,
|
WILC_FW_BSS_TYPE_INFRA = 0,
|
||||||
|
|
Loading…
Reference in a new issue