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>

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 7b29573ef2443bf8f2ad82369d955f24af728aa1..4fa760230ac7fbc9bcea294a0ef844953934ae4f 100644 (file)
--- 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)
        return ret;
 }
 
+#if 0
 static void wl1271_irq_ps_regulate_link(struct wl1271 *wl, u8 hlid, u8 tx_blks)
 {
        bool fw_ps;
@@ -823,6 +824,7 @@ static void wl1271_irq_update_links_status(struct wl1271 *wl,
                                            wl->links[hlid].allocated_blks);
        }
 }
+#endif
 
 static void wl1271_fw_status(struct wl1271 *wl,
                             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) {
                /* Update num of allocated TX blocks per link and ps status */
+#if 0
                wl1271_irq_update_links_status(wl, &full_status->ap);
+#endif
                wl->tx_blocks_available += freed_blocks;
        } else {
                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 c67340ff83c8204b917cad3f5808f3f402af3b16..938af1de6c2c63b7c2d9a4a5394047d840d47cca 100644 (file)
--- 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,
                wl1271_acx_set_inconnection_sta(wl, hdr->addr1);
 }
 
+#if 0
 static void wl1271_tx_regulate_link(struct wl1271 *wl, u8 hlid)
 {
        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)
                wl1271_ps_link_start(wl, hlid, true);
 }
+#endif
 
 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) {
                wl1271_tx_ap_update_inconnection_sta(wl, skb);
+#if 0
                wl1271_tx_regulate_link(wl, hlid);
+#endif
        } else {
                wl1271_tx_update_filters(wl, skb);
        }