Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89b5f74a authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

parents 48c3e371 75a423f4

drivers/net/wireless/ath/ath9k/init.c

+2 −1
Original line number Diff line number Diff line
@@ -802,7 +802,8 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) 
		IEEE80211_HW_PS_NULLFUNC_STACK |

		IEEE80211_HW_SPECTRUM_MGMT |

		IEEE80211_HW_REPORTS_TX_ACK_STATUS |

		IEEE80211_HW_SUPPORTS_RC_TABLE;

		IEEE80211_HW_SUPPORTS_RC_TABLE |

		IEEE80211_HW_SUPPORTS_HT_CCK_RATES;



	if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) {

		hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;

drivers/net/wireless/ath/carl9170/main.c

+2 −1
Original line number Diff line number Diff line
@@ -1860,7 +1860,8 @@ void *carl9170_alloc(size_t priv_size) 
		     IEEE80211_HW_PS_NULLFUNC_STACK |

		     IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC |

		     IEEE80211_HW_SUPPORTS_RC_TABLE |

		     IEEE80211_HW_SIGNAL_DBM;

		     IEEE80211_HW_SIGNAL_DBM |

		     IEEE80211_HW_SUPPORTS_HT_CCK_RATES;



	if (!modparam_noht) {

		/*

drivers/net/wireless/rt2x00/rt2800lib.c

+2 −1
Original line number Diff line number Diff line
@@ -6133,7 +6133,8 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) 
	    IEEE80211_HW_SUPPORTS_PS |

	    IEEE80211_HW_PS_NULLFUNC_STACK |

	    IEEE80211_HW_AMPDU_AGGREGATION |

	    IEEE80211_HW_REPORTS_TX_ACK_STATUS;

	    IEEE80211_HW_REPORTS_TX_ACK_STATUS |

	    IEEE80211_HW_SUPPORTS_HT_CCK_RATES;



	/*

	 * Don't set IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING for USB devices

include/net/mac80211.h

+1 −0
Original line number Diff line number Diff line
@@ -1499,6 +1499,7 @@ enum ieee80211_hw_flags { 
	IEEE80211_HW_SUPPORTS_RC_TABLE			= 1<<24,

	IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF		= 1<<25,

	IEEE80211_HW_TIMING_BEACON_ONLY			= 1<<26,

	IEEE80211_HW_SUPPORTS_HT_CCK_RATES		= 1<<27,

};



/**

net/mac80211/ibss.c

+30 −4
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 


static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,

				      const u8 *bssid, const int beacon_int,

				      struct ieee80211_channel *chan,

				      struct cfg80211_chan_def *req_chandef,

				      const u32 basic_rates,

				      const u16 capability, u64 tsf,

				      bool creator)
@@ -51,6 +51,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, 
	u32 bss_change;

	u8 supp_rates[IEEE80211_MAX_SUPP_RATES];

	struct cfg80211_chan_def chandef;

	struct ieee80211_channel *chan;

	struct beacon_data *presp;

	int frame_len;
@@ -81,7 +82,9 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, 


	sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;



	chandef = ifibss->chandef;

	/* make a copy of the chandef, it could be modified below. */

	chandef = *req_chandef;

	chan = chandef.chan;

	if (!cfg80211_reg_can_beacon(local->hw.wiphy, &chandef)) {

		chandef.width = NL80211_CHAN_WIDTH_20;

		chandef.center_freq1 = chan->center_freq;
@@ -259,10 +262,12 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, 
	struct cfg80211_bss *cbss =

		container_of((void *)bss, struct cfg80211_bss, priv);

	struct ieee80211_supported_band *sband;

	struct cfg80211_chan_def chandef;

	u32 basic_rates;

	int i, j;

	u16 beacon_int = cbss->beacon_interval;

	const struct cfg80211_bss_ies *ies;

	enum nl80211_channel_type chan_type;

	u64 tsf;



	sdata_assert_lock(sdata);
@@ -270,6 +275,26 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, 
	if (beacon_int < 10)

		beacon_int = 10;



	switch (sdata->u.ibss.chandef.width) {

	case NL80211_CHAN_WIDTH_20_NOHT:

	case NL80211_CHAN_WIDTH_20:

	case NL80211_CHAN_WIDTH_40:

		chan_type = cfg80211_get_chandef_type(&sdata->u.ibss.chandef);

		cfg80211_chandef_create(&chandef, cbss->channel, chan_type);

		break;

	case NL80211_CHAN_WIDTH_5:

	case NL80211_CHAN_WIDTH_10:

		cfg80211_chandef_create(&chandef, cbss->channel,

					NL80211_CHAN_WIDTH_20_NOHT);

		chandef.width = sdata->u.ibss.chandef.width;

		break;

	default:

		/* fall back to 20 MHz for unsupported modes */

		cfg80211_chandef_create(&chandef, cbss->channel,

					NL80211_CHAN_WIDTH_20_NOHT);

		break;

	}



	sband = sdata->local->hw.wiphy->bands[cbss->channel->band];



	basic_rates = 0;
@@ -294,7 +319,7 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, 


	__ieee80211_sta_join_ibss(sdata, cbss->bssid,

				  beacon_int,

				  cbss->channel,

				  &chandef,

				  basic_rates,

				  cbss->capability,

				  tsf, false);
@@ -736,7 +761,7 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata) 
		sdata->drop_unencrypted = 0;



	__ieee80211_sta_join_ibss(sdata, bssid, sdata->vif.bss_conf.beacon_int,

				  ifibss->chandef.chan, ifibss->basic_rates,

				  &ifibss->chandef, ifibss->basic_rates,

				  capability, 0, true);

}
@@ -1138,6 +1163,7 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata) 
	clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state);

	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED |

						BSS_CHANGED_IBSS);

	ieee80211_vif_release_channel(sdata);

	synchronize_rcu();

	kfree(presp);