Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 278659
b: refs/heads/master
c: 74ec839
h: refs/heads/master
i:
  278657: 82a5ff8
  278655: 3a79236
v: v3
  • Loading branch information
Eliad Peller authored and Luciano Coelho committed Oct 7, 2011
1 parent 8e3d054 commit 21739a7
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 19 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: 6ec45dc282f6983d5685758c5e8993bc2c818d3c
refs/heads/master: 74ec839557878007c3f97d1bc89e09fde5d0f3fa
2 changes: 0 additions & 2 deletions trunk/drivers/net/wireless/wl12xx/debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -351,8 +351,6 @@ static ssize_t driver_state_read(struct file *file, char __user *user_buf,
DRIVER_STATE_PRINT_INT(state);
DRIVER_STATE_PRINT_INT(channel);
DRIVER_STATE_PRINT_INT(band);
DRIVER_STATE_PRINT_INT(psm_entry_retry);
DRIVER_STATE_PRINT_INT(ps_poll_failures);
DRIVER_STATE_PRINT_INT(power_level);
DRIVER_STATE_PRINT_INT(rssi_thold);
DRIVER_STATE_PRINT_INT(last_rssi_event);
Expand Down
14 changes: 7 additions & 7 deletions trunk/drivers/net/wireless/wl12xx/event.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ static void wl1271_event_pspoll_delivery_fail(struct wl1271 *wl,
int delay = wl->conf.conn.ps_poll_recovery_period;
int ret;

wl->ps_poll_failures++;
if (wl->ps_poll_failures == 1)
wlvif->ps_poll_failures++;
if (wlvif->ps_poll_failures == 1)
wl1271_info("AP with dysfunctional ps-poll, "
"trying to work around it.");

Expand Down Expand Up @@ -118,23 +118,23 @@ static int wl1271_event_ps_report(struct wl1271 *wl,

if (!test_bit(WL1271_FLAG_PSM, &wl->flags)) {
/* remain in active mode */
wl->psm_entry_retry = 0;
wlvif->psm_entry_retry = 0;
break;
}

if (wl->psm_entry_retry < total_retries) {
wl->psm_entry_retry++;
if (wlvif->psm_entry_retry < total_retries) {
wlvif->psm_entry_retry++;
ret = wl1271_ps_set_mode(wl, wlvif,
STATION_POWER_SAVE_MODE,
wlvif->basic_rate, true);
} else {
wl1271_info("No ack to nullfunc from AP.");
wl->psm_entry_retry = 0;
wlvif->psm_entry_retry = 0;
*beacon_loss = true;
}
break;
case EVENT_ENTER_POWER_SAVE_SUCCESS:
wl->psm_entry_retry = 0;
wlvif->psm_entry_retry = 0;

/* enable beacon filtering */
ret = wl1271_acx_beacon_filter_opt(wl, wlvif, true);
Expand Down
4 changes: 1 addition & 3 deletions trunk/drivers/net/wireless/wl12xx/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2141,7 +2141,6 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
wl->band = IEEE80211_BAND_2GHZ;

wl->rx_counter = 0;
wl->psm_entry_retry = 0;
wl->power_level = WL1271_DEFAULT_POWER_LEVEL;
wl->tx_blocks_available = 0;
wl->tx_allocated_blocks = 0;
Expand Down Expand Up @@ -3540,7 +3539,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
wlvif->aid = bss_conf->aid;
set_assoc = true;

wl->ps_poll_failures = 0;
wlvif->ps_poll_failures = 0;

/*
* use basic rates from AP, and determine lowest rate
Expand Down Expand Up @@ -4894,7 +4893,6 @@ struct ieee80211_hw *wl1271_alloc_hw(void)

wl->channel = WL1271_DEFAULT_CHANNEL;
wl->rx_counter = 0;
wl->psm_entry_retry = 0;
wl->power_level = WL1271_DEFAULT_POWER_LEVEL;
wl->band = IEEE80211_BAND_2GHZ;
wl->vif = NULL;
Expand Down
12 changes: 6 additions & 6 deletions trunk/drivers/net/wireless/wl12xx/wl12xx.h
Original file line number Diff line number Diff line change
Expand Up @@ -511,12 +511,6 @@ struct wl1271 {
struct completion *elp_compl;
struct delayed_work elp_work;

/* counter for ps-poll delivery failures */
int ps_poll_failures;

/* retry counter for PSM entries */
u8 psm_entry_retry;

/* in dBm */
int power_level;

Expand Down Expand Up @@ -652,6 +646,12 @@ struct wl12xx_vif {

struct completion *ps_compl;
struct delayed_work pspoll_work;

/* counter for ps-poll delivery failures */
int ps_poll_failures;

/* retry counter for PSM entries */
u8 psm_entry_retry;
};

static inline struct wl12xx_vif *wl12xx_vif_to_data(struct ieee80211_vif *vif)
Expand Down

0 comments on commit 21739a7

Please sign in to comment.