openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

wl12xx: temporarily disable advanced ap functions 

In order to keep to driver compiling during the patchset,
while avoiding one-huge-patch, temporarily disable some
advanced ap functions.

These changes will be reverted later in the patchset, as
part of the patches for advanced ap functions support.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
This commit is contained in:
Eliad Peller 2011-08-14 13:17:03 +03:00 committed by Luciano Coelho
parent 2920743a14
commit dbe25cb5eb
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/wl12xx/main.c
View File

@ -773,6 +773,7 @@ static int wl1271_plt_init(struct wl1271 *wl)
return ret; return ret;
} }
#if 0
static void wl1271_irq_ps_regulate_link(struct wl1271 *wl, u8 hlid, u8 tx_blks) static void wl1271_irq_ps_regulate_link(struct wl1271 *wl, u8 hlid, u8 tx_blks)
{ {
bool fw_ps; bool fw_ps;
@ -823,6 +824,7 @@ static void wl1271_irq_update_links_status(struct wl1271 *wl,
wl->links[hlid].allocated_blks); wl->links[hlid].allocated_blks);
} }
} }
#endif
static void wl1271_fw_status(struct wl1271 *wl, static void wl1271_fw_status(struct wl1271 *wl,
struct wl1271_fw_full_status *full_status) struct wl1271_fw_full_status *full_status)
@ -861,7 +863,9 @@ static void wl1271_fw_status(struct wl1271 *wl,
if (wl->bss_type == BSS_TYPE_AP_BSS) { if (wl->bss_type == BSS_TYPE_AP_BSS) {
/* Update num of allocated TX blocks per link and ps status */ /* Update num of allocated TX blocks per link and ps status */
#if 0
wl1271_irq_update_links_status(wl, &full_status->ap); wl1271_irq_update_links_status(wl, &full_status->ap);
#endif
wl->tx_blocks_available += freed_blocks; wl->tx_blocks_available += freed_blocks;
} else { } else {
int avail = full_status->sta.tx_total - wl->tx_allocated_blocks; int avail = full_status->sta.tx_total - wl->tx_allocated_blocks;

4
drivers/net/wireless/wl12xx/tx.c
View File

@ -111,6 +111,7 @@ static void wl1271_tx_ap_update_inconnection_sta(struct wl1271 *wl,
wl1271_acx_set_inconnection_sta(wl, hdr->addr1); wl1271_acx_set_inconnection_sta(wl, hdr->addr1);
} }
#if 0
static void wl1271_tx_regulate_link(struct wl1271 *wl, u8 hlid) static void wl1271_tx_regulate_link(struct wl1271 *wl, u8 hlid)
{ {
bool fw_ps; bool fw_ps;
@ -130,6 +131,7 @@ static void wl1271_tx_regulate_link(struct wl1271 *wl, u8 hlid)
if (fw_ps && tx_blks >= WL1271_PS_STA_MAX_BLOCKS) if (fw_ps && tx_blks >= WL1271_PS_STA_MAX_BLOCKS)
wl1271_ps_link_start(wl, hlid, true); wl1271_ps_link_start(wl, hlid, true);
} }
#endif
u8 wl1271_tx_get_hlid(struct sk_buff *skb) u8 wl1271_tx_get_hlid(struct sk_buff *skb)
{ {
@ -384,7 +386,9 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct sk_buff *skb,
if (wl->bss_type == BSS_TYPE_AP_BSS) { if (wl->bss_type == BSS_TYPE_AP_BSS) {
wl1271_tx_ap_update_inconnection_sta(wl, skb); wl1271_tx_ap_update_inconnection_sta(wl, skb);
#if 0
wl1271_tx_regulate_link(wl, hlid); wl1271_tx_regulate_link(wl, hlid);
#endif
} else { } else {
wl1271_tx_update_filters(wl, skb); wl1271_tx_update_filters(wl, skb);
} }