Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 265785
b: refs/heads/master
c: dbe25cb
h: refs/heads/master
i:
  265783: 9d85a6b
v: v3
  • Loading branch information
Eliad Peller authored and Luciano Coelho committed Aug 22, 2011
1 parent 1a7372f commit 6b0a030
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2920743a14764eda099700e1eca9a282393cee16
refs/heads/master: dbe25cb5eb04b0ffdad582a93f9fe9edd0ed791b
4 changes: 4 additions & 0 deletions trunk/drivers/net/wireless/wl12xx/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions trunk/drivers/net/wireless/wl12xx/tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
{
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit 6b0a030

Please sign in to comment.