History

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem

John W. Linville committed 13 years ago

Commit 81ca2ff2 parents 4a5a8aa 19c36169 files · +52 −10Browse files

Unified · Split

9 files
  1. drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +10 −0
  2. drivers/net/wireless/ath/ath9k/init.c +2 −1
  3. drivers/net/wireless/ath/ath9k/main.c +1 −2
  4. drivers/net/wireless/ath/carl9170/main.c +2 −1
  5. drivers/net/wireless/iwlegacy/4965-mac.c +1 −1
  6. drivers/net/wireless/rt2x00/rt2800lib.c +2 −1
  7. include/net/mac80211.h +1 −0
  8. net/mac80211/ibss.c +30 −4
  9. net/mac80211/rc80211_minstrel_ht.c +3 −0
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c+10−0
@@ -448,6 +448,7 @@ static void ath9k_htc_tx_process(struct ath9k_htc_priv *priv, · 447 unmodified lines
448448 struct ieee80211_conf *cur_conf = &priv->hw->conf;
449449 bool txok;
450450 int slot;
451+ int hdrlen, padsize;
451452
452453 slot = strip_drv_header(priv, skb);
453454 if (slot < 0) {
@@ -504,6 +505,15 @@ send_mac80211: · 50 unmodified lines
504505
505506 ath9k_htc_tx_clear_slot(priv, slot);
506507
508+ /* Remove padding before handing frame back to mac80211 */
509+ hdrlen = ieee80211_get_hdrlen_from_skb(skb);
510+
511+ padsize = hdrlen & 3;
512+ if (padsize && skb->len > hdrlen + padsize) {
513+ memmove(skb->data + padsize, skb->data, hdrlen);
514+ skb_pull(skb, padsize);
515+ }
516+
507517 /* Send status to mac80211 */
508518 ieee80211_tx_status(priv->hw, skb);
509519 }
drivers/net/wireless/ath/ath9k/init.c+2−1
@@ -802,7 +802,8 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) · 801 unmodified lines
802802 IEEE80211_HW_PS_NULLFUNC_STACK |
803803 IEEE80211_HW_SPECTRUM_MGMT |
804804 IEEE80211_HW_REPORTS_TX_ACK_STATUS |
805− IEEE80211_HW_SUPPORTS_RC_TABLE;
805+ IEEE80211_HW_SUPPORTS_RC_TABLE |
806+ IEEE80211_HW_SUPPORTS_HT_CCK_RATES;
806807
807808 if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) {
808809 hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;
drivers/net/wireless/ath/ath9k/main.c+1−2
@@ -173,8 +173,7 @@ static void ath_restart_work(struct ath_softc *sc) · 172 unmodified lines
173173 {
174174 ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, 0);
175175
176− if (AR_SREV_9340(sc->sc_ah) || AR_SREV_9485(sc->sc_ah) ||
177− AR_SREV_9550(sc->sc_ah))
176+ if (AR_SREV_9340(sc->sc_ah) || AR_SREV_9330(sc->sc_ah))
178177 ieee80211_queue_delayed_work(sc->hw, &sc->hw_pll_work,
179178 msecs_to_jiffies(ATH_PLL_WORK_INTERVAL));
180179
drivers/net/wireless/ath/carl9170/main.c+2−1
@@ -1860,7 +1860,8 @@ void *carl9170_alloc(size_t priv_size) · 1859 unmodified lines
18601860 IEEE80211_HW_PS_NULLFUNC_STACK |
18611861 IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC |
18621862 IEEE80211_HW_SUPPORTS_RC_TABLE |
1863− IEEE80211_HW_SIGNAL_DBM;
1863+ IEEE80211_HW_SIGNAL_DBM |
1864+ IEEE80211_HW_SUPPORTS_HT_CCK_RATES;
18641865
18651866 if (!modparam_noht) {
18661867 /*
drivers/net/wireless/iwlegacy/4965-mac.c+1−1
@@ -4464,9 +4464,9 @@ il4965_irq_tasklet(struct il_priv *il) · 4463 unmodified lines
44644464 set_bit(S_RFKILL, &il->status);
44654465 } else {
44664466 clear_bit(S_RFKILL, &il->status);
4467− wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rf_kill);
44684467 il_force_reset(il, true);
44694468 }
4469+ wiphy_rfkill_set_hw_state(il->hw->wiphy, hw_rf_kill);
44704470
44714471 handled |= CSR_INT_BIT_RF_KILL;
44724472 }
drivers/net/wireless/rt2x00/rt2800lib.c+2−1
@@ -6133,7 +6133,8 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) · 6132 unmodified lines
61336133 IEEE80211_HW_SUPPORTS_PS |
61346134 IEEE80211_HW_PS_NULLFUNC_STACK |
61356135 IEEE80211_HW_AMPDU_AGGREGATION |
6136− IEEE80211_HW_REPORTS_TX_ACK_STATUS;
6136+ IEEE80211_HW_REPORTS_TX_ACK_STATUS |
6137+ IEEE80211_HW_SUPPORTS_HT_CCK_RATES;
61376138
61386139 /*
61396140 * Don't set IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING for USB devices
include/net/mac80211.h+1−0
@@ -1499,6 +1499,7 @@ enum ieee80211_hw_flags { · 1498 unmodified lines
14991499 IEEE80211_HW_SUPPORTS_RC_TABLE = 1<<24,
15001500 IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF = 1<<25,
15011501 IEEE80211_HW_TIMING_BEACON_ONLY = 1<<26,
1502+ IEEE80211_HW_SUPPORTS_HT_CCK_RATES = 1<<27,
15021503 };
15031504
15041505 /**
net/mac80211/ibss.c+30−4
@@ -36,7 +36,7 @@ · 35 unmodified lines
3636
3737 static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
3838 const u8 *bssid, const int beacon_int,
39− struct ieee80211_channel *chan,
39+ struct cfg80211_chan_def *req_chandef,
4040 const u32 basic_rates,
4141 const u16 capability, u64 tsf,
4242 bool creator)
@@ -51,6 +51,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, · 8 unmodified lines
5151 u32 bss_change;
5252 u8 supp_rates[IEEE80211_MAX_SUPP_RATES];
5353 struct cfg80211_chan_def chandef;
54+ struct ieee80211_channel *chan;
5455 struct beacon_data *presp;
5556 int frame_len;
5657
@@ -81,7 +82,9 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, · 24 unmodified lines
8182
8283 sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;
8384
84− chandef = ifibss->chandef;
85+ /* make a copy of the chandef, it could be modified below. */
86+ chandef = *req_chandef;
87+ chan = chandef.chan;
8588 if (!cfg80211_reg_can_beacon(local->hw.wiphy, &chandef)) {
8689 chandef.width = NL80211_CHAN_WIDTH_20;
8790 chandef.center_freq1 = chan->center_freq;
@@ -259,10 +262,12 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, · 171 unmodified lines
259262 struct cfg80211_bss *cbss =
260263 container_of((void *)bss, struct cfg80211_bss, priv);
261264 struct ieee80211_supported_band *sband;
265+ struct cfg80211_chan_def chandef;
262266 u32 basic_rates;
263267 int i, j;
264268 u16 beacon_int = cbss->beacon_interval;
265269 const struct cfg80211_bss_ies *ies;
270+ enum nl80211_channel_type chan_type;
266271 u64 tsf;
267272
268273 sdata_assert_lock(sdata);
@@ -270,6 +275,26 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, · 1 unmodified line
270275 if (beacon_int < 10)
271276 beacon_int = 10;
272277
278+ switch (sdata->u.ibss.chandef.width) {
279+ case NL80211_CHAN_WIDTH_20_NOHT:
280+ case NL80211_CHAN_WIDTH_20:
281+ case NL80211_CHAN_WIDTH_40:
282+ chan_type = cfg80211_get_chandef_type(&sdata->u.ibss.chandef);
283+ cfg80211_chandef_create(&chandef, cbss->channel, chan_type);
284+ break;
285+ case NL80211_CHAN_WIDTH_5:
286+ case NL80211_CHAN_WIDTH_10:
287+ cfg80211_chandef_create(&chandef, cbss->channel,
288+ NL80211_CHAN_WIDTH_20_NOHT);
289+ chandef.width = sdata->u.ibss.chandef.width;
290+ break;
291+ default:
292+ /* fall back to 20 MHz for unsupported modes */
293+ cfg80211_chandef_create(&chandef, cbss->channel,
294+ NL80211_CHAN_WIDTH_20_NOHT);
295+ break;
296+ }
297+
273298 sband = sdata->local->hw.wiphy->bands[cbss->channel->band];
274299
275300 basic_rates = 0;
@@ -294,7 +319,7 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, · 18 unmodified lines
294319
295320 __ieee80211_sta_join_ibss(sdata, cbss->bssid,
296321 beacon_int,
297− cbss->channel,
322+ &chandef,
298323 basic_rates,
299324 cbss->capability,
300325 tsf, false);
@@ -736,7 +761,7 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata) · 435 unmodified lines
736761 sdata->drop_unencrypted = 0;
737762
738763 __ieee80211_sta_join_ibss(sdata, bssid, sdata->vif.bss_conf.beacon_int,
739− ifibss->chandef.chan, ifibss->basic_rates,
764+ &ifibss->chandef, ifibss->basic_rates,
740765 capability, 0, true);
741766 }
742767
@@ -1138,6 +1163,7 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata) · 395 unmodified lines
11381163 clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state);
11391164 ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED |
11401165 BSS_CHANGED_IBSS);
1166+ ieee80211_vif_release_channel(sdata);
11411167 synchronize_rcu();
11421168 kfree(presp);
11431169
net/mac80211/rc80211_minstrel_ht.c+3−0
@@ -828,6 +828,9 @@ minstrel_ht_update_cck(struct minstrel_priv *mp, struct minstrel_ht_sta *mi, · 827 unmodified lines
828828 if (sband->band != IEEE80211_BAND_2GHZ)
829829 return;
830830
831+ if (!(mp->hw->flags & IEEE80211_HW_SUPPORTS_HT_CCK_RATES))
832+ return;
833+
831834 mi->cck_supported = 0;
832835 mi->cck_supported_short = 0;
833836 for (i = 0; i < 4; i++) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t