Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 6760
b: refs/heads/master
c: 74fae82
h: refs/heads/master
v: v3
  • Loading branch information
Jeff Garzik committed Jul 31, 2005
1 parent 416a940 commit b0a066e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4fa969cfb2a6406fcffd0d1ec5f33ebf3fea9053
refs/heads/master: 74fae82c8bd5dd78365abe25506a9ba388d4a889
10 changes: 5 additions & 5 deletions trunk/drivers/net/wireless/hostap/hostap_ap.c
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ static void ap_control_kickall(struct ap_data *ap)
{
struct list_head *ptr, *n;
struct sta_info *sta;

spin_lock_bh(&ap->sta_table_lock);
for (ptr = ap->sta_list.next, n = ptr->next; ptr != &ap->sta_list;
ptr = n, n = ptr->next) {
Expand Down Expand Up @@ -1573,7 +1573,7 @@ static void handle_assoc(local_info_t *local, struct sk_buff *skb,
u++; left--;
ileft = *u;
u++; left--;

if (ileft > left || ileft == 0 ||
ileft > WLAN_SUPP_RATES_MAX) {
txt = "SUPP_RATES len error";
Expand Down Expand Up @@ -2047,7 +2047,7 @@ static void handle_beacon(local_info_t *local, struct sk_buff *skb,
u++; left--;
ileft = *u;
u++; left--;

if (ileft > left || ileft == 0 || ileft > 8) {
PDEBUG(DEBUG_AP, " - SUPP_RATES len error\n");
return;
Expand All @@ -2064,7 +2064,7 @@ static void handle_beacon(local_info_t *local, struct sk_buff *skb,
u++; left--;
ileft = *u;
u++; left--;

if (ileft > left || ileft != 1) {
PDEBUG(DEBUG_AP, " - DS_PARAMS len error\n");
return;
Expand Down Expand Up @@ -2839,7 +2839,7 @@ void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb)

sta->tx_since_last_failure = 0;
sta->tx_consecutive_exc++;

if (sta->tx_consecutive_exc >= WLAN_RATE_DECREASE_THRESHOLD &&
sta->tx_rate_idx > 0 && meta->rate <= sta->tx_rate) {
/* use next lower rate */
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/wireless/hostap/hostap_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -644,13 +644,13 @@ static int prism2_config(dev_link_t *link)
link->conf.ConfigIndex = cfg->index;
PDEBUG(DEBUG_EXTRA, "Checking CFTABLE_ENTRY 0x%02X "
"(default 0x%02X)\n", cfg->index, dflt.index);

/* Does this card need audio output? */
if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
link->conf.Attributes |= CONF_ENABLE_SPKR;
link->conf.Status = CCSR_AUDIO_ENA;
}

/* Use power settings for Vcc and Vpp if present */
/* Note that the CIS values need to be rescaled */
if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/wireless/hostap/hostap_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ static int hostap_set_rate(struct net_device *dev)
hostap_set_word(dev, HFA384X_RID_CNFSUPPORTEDRATES,
local->tx_rate_control) ||
local->func->reset_port(dev));

if (ret) {
printk(KERN_WARNING "%s: TXRateControl/cnfSupportedRates "
"setting to 0x%x failed\n",
Expand Down

0 comments on commit b0a066e

Please sign in to comment.