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

Commit 6bd2bd27 authored by John W. Linville's avatar John W. Linville
Browse files

Merge tag 'mac80211-next-for-john-2014-09-12' of... 

Merge tag 'mac80211-next-for-john-2014-09-12' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg <johannes@sipsolutions.net> says:

"This time, I have some rate minstrel improvements, support for a very
small feature from CCX that Steinar reverse-engineered, dynamic ACK
timeout support, a number of changes for TDLS, early support for radio
resource measurement and many fixes. Also, I'm changing a number of
places to clear key memory when it's freed and Intel claims copyright
for code they developed."

Conflicts:
	net/mac80211/iface.c

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parents eb2eacf7 0d8614b4

drivers/net/wireless/ath/ath10k/mac.c

+3 −2
Original line number Diff line number Diff line
@@ -4838,7 +4838,6 @@ int ath10k_mac_register(struct ath10k *ar) 
			IEEE80211_HW_MFP_CAPABLE |

			IEEE80211_HW_REPORTS_TX_ACK_STATUS |

			IEEE80211_HW_HAS_RATE_CONTROL |

			IEEE80211_HW_SUPPORTS_STATIC_SMPS |

			IEEE80211_HW_AP_LINK_PS |

			IEEE80211_HW_SPECTRUM_MGMT;
@@ -4846,8 +4845,10 @@ int ath10k_mac_register(struct ath10k *ar) 
	 * bytes is used for padding/alignment if necessary. */

	ar->hw->extra_tx_headroom += sizeof(struct htt_data_tx_desc_frag)*2 + 4;



	ar->hw->wiphy->features |= NL80211_FEATURE_STATIC_SMPS;



	if (ar->ht_cap_info & WMI_HT_CAP_DYNAMIC_SMPS)

		ar->hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS;

		ar->hw->wiphy->features |= NL80211_FEATURE_DYNAMIC_SMPS;



	if (ar->ht_cap_info & WMI_HT_CAP_ENABLED) {

		ar->hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;

drivers/net/wireless/ath/ath5k/mac80211-ops.c

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ ath5k_get_survey(struct ieee80211_hw *hw, int idx, struct survey_info *survey) 
 * reset.

 */

static void

ath5k_set_coverage_class(struct ieee80211_hw *hw, u8 coverage_class)

ath5k_set_coverage_class(struct ieee80211_hw *hw, s16 coverage_class)

{

	struct ath5k_hw *ah = hw->priv;

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

+1 −1
Original line number Diff line number Diff line
@@ -1722,7 +1722,7 @@ static int ath9k_htc_set_rts_threshold(struct ieee80211_hw *hw, u32 value) 
}



static void ath9k_htc_set_coverage_class(struct ieee80211_hw *hw,

					 u8 coverage_class)

					 s16 coverage_class)

{

	struct ath9k_htc_priv *priv = hw->priv;

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

+2 −1
Original line number Diff line number Diff line
@@ -1860,7 +1860,8 @@ static int ath9k_get_survey(struct ieee80211_hw *hw, int idx, 
	return 0;

}



static void ath9k_set_coverage_class(struct ieee80211_hw *hw, u8 coverage_class)

static void ath9k_set_coverage_class(struct ieee80211_hw *hw,

				     s16 coverage_class)

{

	struct ath_softc *sc = hw->priv;

	struct ath_hw *ah = sc->sc_ah;

drivers/net/wireless/iwlegacy/4965-mac.c

+2 −3
Original line number Diff line number Diff line
@@ -5757,9 +5757,8 @@ il4965_mac_setup_register(struct il_priv *il, u32 max_probe_length) 
	    IEEE80211_HW_REPORTS_TX_ACK_STATUS | IEEE80211_HW_SUPPORTS_PS |

	    IEEE80211_HW_SUPPORTS_DYNAMIC_PS;

	if (il->cfg->sku & IL_SKU_N)

		hw->flags |=

		    IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |

		    IEEE80211_HW_SUPPORTS_STATIC_SMPS;

		hw->wiphy->features |= NL80211_FEATURE_DYNAMIC_SMPS |

				       NL80211_FEATURE_STATIC_SMPS;



	hw->sta_data_size = sizeof(struct il_station_priv);

	hw->vif_data_size = sizeof(struct il_vif_priv);