diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/wl12xx/event.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 27 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/ps.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/wl12xx/rx.c | 7 |
4 files changed, 32 insertions, 8 deletions
diff --git a/drivers/net/wireless/wl12xx/event.c b/drivers/net/wireless/wl12xx/event.c index d7be3aec6fc..933817ad6d6 100644 --- a/drivers/net/wireless/wl12xx/event.c +++ b/drivers/net/wireless/wl12xx/event.c @@ -279,7 +279,9 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox) sta = ieee80211_find_sta(wl->vif, addr); if (sta) { wl1271_debug(DEBUG_EVENT, "remove sta %d", h); +#if 0 ieee80211_report_low_ack(sta, num_packets); +#endif } rcu_read_unlock(); } diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 7aa3a2bc060..a8eaa54158c 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c @@ -3088,11 +3088,21 @@ out: return ret; } +/* + * int (*ampdu_action)(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + enum ieee80211_ampdu_mlme_action action, + struct ieee80211_sta *sta, u16 tid, u16 *ssn); +*/ + static int wl1271_op_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, enum ieee80211_ampdu_mlme_action action, - struct ieee80211_sta *sta, u16 tid, u16 *ssn, - u8 buf_size) + struct ieee80211_sta *sta, u16 tid, u16 *ssn +#if 0 + , u8 buf_size +#endif + ) { struct wl1271 *wl = hw->priv; int ret; @@ -3422,7 +3432,9 @@ static const struct ieee80211_ops wl1271_ops = { .sta_add = wl1271_op_sta_add, .sta_remove = wl1271_op_sta_remove, .ampdu_action = wl1271_op_ampdu_action, +#if 0 .tx_frames_pending = wl1271_tx_frames_pending, +#endif CFG80211_TESTMODE_CMD(wl1271_tm_cmd) }; @@ -3609,8 +3621,11 @@ int wl1271_init_ieee80211(struct wl1271 *wl) IEEE80211_HW_SUPPORTS_UAPSD | IEEE80211_HW_HAS_RATE_CONTROL | IEEE80211_HW_CONNECTION_MONITOR | - IEEE80211_HW_SUPPORTS_CQM_RSSI | - IEEE80211_HW_AP_LINK_PS; + IEEE80211_HW_SUPPORTS_CQM_RSSI +#if 0 + | IEEE80211_HW_AP_LINK_PS +#endif + ; wl->hw->wiphy->cipher_suites = cipher_suites; wl->hw->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites); @@ -3652,9 +3667,9 @@ int wl1271_init_ieee80211(struct wl1271 *wl) SET_IEEE80211_DEV(wl->hw, wl1271_wl_to_dev(wl)); wl->hw->sta_data_size = sizeof(struct wl1271_station); - +#if 0 wl->hw->max_rx_aggregation_subframes = 8; - +#endif return 0; } EXPORT_SYMBOL_GPL(wl1271_init_ieee80211); diff --git a/drivers/net/wireless/wl12xx/ps.c b/drivers/net/wireless/wl12xx/ps.c index b59b67711a1..874468307fb 100644 --- a/drivers/net/wireless/wl12xx/ps.c +++ b/drivers/net/wireless/wl12xx/ps.c @@ -234,7 +234,9 @@ void wl1271_ps_link_start(struct wl1271 *wl, u8 hlid, bool clean_queues) return; } +#if 0 ieee80211_sta_ps_transition_ni(sta, true); +#endif rcu_read_unlock(); /* do we want to filter all frames from this link's queues? */ @@ -263,7 +265,9 @@ void wl1271_ps_link_end(struct wl1271 *wl, u8 hlid) goto end; } +#if 0 ieee80211_sta_ps_transition_ni(sta, false); +#endif end: rcu_read_unlock(); } diff --git a/drivers/net/wireless/wl12xx/rx.c b/drivers/net/wireless/wl12xx/rx.c index 70091035e01..5aeed395e8a 100644 --- a/drivers/net/wireless/wl12xx/rx.c +++ b/drivers/net/wireless/wl12xx/rx.c @@ -72,8 +72,11 @@ static void wl1271_rx_status(struct wl1271 *wl, */ wl->noise = desc->rssi - (desc->snr >> 1); - status->freq = ieee80211_channel_to_frequency(desc->channel, - status->band); + status->freq = ieee80211_channel_to_frequency(desc->channel +#if 0 + , status->band +#endif + ); if (desc->flags & WL1271_RX_DESC_ENCRYPT_MASK) { u8 desc_err_code = desc->status & WL1271_RX_DESC_STATUS_MASK; |