diff options
author | Eliad Peller <eliad@wizery.com> | 2011-08-14 06:17:03 -0400 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2011-08-22 05:35:23 -0400 |
commit | dbe25cb5eb04b0ffdad582a93f9fe9edd0ed791b (patch) | |
tree | 54cbbb5445d2d543fd9da93fab7cdaf987c4d489 /drivers | |
parent | 2920743a14764eda099700e1eca9a282393cee16 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/tx.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 7b29573ef244..4fa760230ac7 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c | |||
@@ -773,6 +773,7 @@ static int wl1271_plt_init(struct wl1271 *wl) | |||
773 | return ret; | 773 | return ret; |
774 | } | 774 | } |
775 | 775 | ||
776 | #if 0 | ||
776 | static void wl1271_irq_ps_regulate_link(struct wl1271 *wl, u8 hlid, u8 tx_blks) | 777 | static void wl1271_irq_ps_regulate_link(struct wl1271 *wl, u8 hlid, u8 tx_blks) |
777 | { | 778 | { |
778 | bool fw_ps; | 779 | bool fw_ps; |
@@ -823,6 +824,7 @@ static void wl1271_irq_update_links_status(struct wl1271 *wl, | |||
823 | wl->links[hlid].allocated_blks); | 824 | wl->links[hlid].allocated_blks); |
824 | } | 825 | } |
825 | } | 826 | } |
827 | #endif | ||
826 | 828 | ||
827 | static void wl1271_fw_status(struct wl1271 *wl, | 829 | static void wl1271_fw_status(struct wl1271 *wl, |
828 | struct wl1271_fw_full_status *full_status) | 830 | struct wl1271_fw_full_status *full_status) |
@@ -861,7 +863,9 @@ static void wl1271_fw_status(struct wl1271 *wl, | |||
861 | 863 | ||
862 | if (wl->bss_type == BSS_TYPE_AP_BSS) { | 864 | if (wl->bss_type == BSS_TYPE_AP_BSS) { |
863 | /* Update num of allocated TX blocks per link and ps status */ | 865 | /* Update num of allocated TX blocks per link and ps status */ |
866 | #if 0 | ||
864 | wl1271_irq_update_links_status(wl, &full_status->ap); | 867 | wl1271_irq_update_links_status(wl, &full_status->ap); |
868 | #endif | ||
865 | wl->tx_blocks_available += freed_blocks; | 869 | wl->tx_blocks_available += freed_blocks; |
866 | } else { | 870 | } else { |
867 | int avail = full_status->sta.tx_total - wl->tx_allocated_blocks; | 871 | int avail = full_status->sta.tx_total - wl->tx_allocated_blocks; |
diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c index c67340ff83c8..938af1de6c2c 100644 --- a/drivers/net/wireless/wl12xx/tx.c +++ b/drivers/net/wireless/wl12xx/tx.c | |||
@@ -111,6 +111,7 @@ static void wl1271_tx_ap_update_inconnection_sta(struct wl1271 *wl, | |||
111 | wl1271_acx_set_inconnection_sta(wl, hdr->addr1); | 111 | wl1271_acx_set_inconnection_sta(wl, hdr->addr1); |
112 | } | 112 | } |
113 | 113 | ||
114 | #if 0 | ||
114 | static void wl1271_tx_regulate_link(struct wl1271 *wl, u8 hlid) | 115 | static void wl1271_tx_regulate_link(struct wl1271 *wl, u8 hlid) |
115 | { | 116 | { |
116 | bool fw_ps; | 117 | bool fw_ps; |
@@ -130,6 +131,7 @@ static void wl1271_tx_regulate_link(struct wl1271 *wl, u8 hlid) | |||
130 | if (fw_ps && tx_blks >= WL1271_PS_STA_MAX_BLOCKS) | 131 | if (fw_ps && tx_blks >= WL1271_PS_STA_MAX_BLOCKS) |
131 | wl1271_ps_link_start(wl, hlid, true); | 132 | wl1271_ps_link_start(wl, hlid, true); |
132 | } | 133 | } |
134 | #endif | ||
133 | 135 | ||
134 | u8 wl1271_tx_get_hlid(struct sk_buff *skb) | 136 | u8 wl1271_tx_get_hlid(struct sk_buff *skb) |
135 | { | 137 | { |
@@ -384,7 +386,9 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct sk_buff *skb, | |||
384 | 386 | ||
385 | if (wl->bss_type == BSS_TYPE_AP_BSS) { | 387 | if (wl->bss_type == BSS_TYPE_AP_BSS) { |
386 | wl1271_tx_ap_update_inconnection_sta(wl, skb); | 388 | wl1271_tx_ap_update_inconnection_sta(wl, skb); |
389 | #if 0 | ||
387 | wl1271_tx_regulate_link(wl, hlid); | 390 | wl1271_tx_regulate_link(wl, hlid); |
391 | #endif | ||
388 | } else { | 392 | } else { |
389 | wl1271_tx_update_filters(wl, skb); | 393 | wl1271_tx_update_filters(wl, skb); |
390 | } | 394 | } |