Commit 7546ff95 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-next

parents 2cdf359a c82b5a74

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

+1 −1
Original line number Diff line number Diff line
@@ -2094,7 +2094,7 @@ static void ath9k_wow_add_pattern(struct ath_softc *sc, 
{

	struct ath_hw *ah = sc->sc_ah;

	struct ath9k_wow_pattern *wow_pattern = NULL;

	struct cfg80211_wowlan_trig_pkt_pattern *patterns = wowlan->patterns;

	struct cfg80211_pkt_pattern *patterns = wowlan->patterns;

	int mask_len;

	s8 i = 0;

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

+2 −0
Original line number Diff line number Diff line
@@ -1275,6 +1275,7 @@ static void ath_tx_status(void *priv, struct ieee80211_supported_band *sband, 
}



static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband,

			  struct cfg80211_chan_def *chandef,

                          struct ieee80211_sta *sta, void *priv_sta)

{

	struct ath_softc *sc = priv;
@@ -1313,6 +1314,7 @@ static void ath_rate_init(void *priv, struct ieee80211_supported_band *sband, 
}



static void ath_rate_update(void *priv, struct ieee80211_supported_band *sband,

			    struct cfg80211_chan_def *chandef,

			    struct ieee80211_sta *sta, void *priv_sta,

			    u32 changed)

{

drivers/net/wireless/iwlegacy/3945-rs.c

+1 −0
Original line number Diff line number Diff line
@@ -887,6 +887,7 @@ il3945_remove_debugfs(void *il, void *il_sta) 
 */

static void

il3945_rs_rate_init_stub(void *il_r, struct ieee80211_supported_band *sband,

			 struct cfg80211_chan_def *chandef,

			 struct ieee80211_sta *sta, void *il_sta)

{

}

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

+1 −0
Original line number Diff line number Diff line
@@ -2803,6 +2803,7 @@ il4965_rs_remove_debugfs(void *il, void *il_sta) 
 */

static void

il4965_rs_rate_init_stub(void *il_r, struct ieee80211_supported_band *sband,

			 struct cfg80211_chan_def *chandef,

			 struct ieee80211_sta *sta, void *il_sta)

{

}

drivers/net/wireless/iwlwifi/dvm/rs.c

+2 −1
Original line number Diff line number Diff line
@@ -3319,6 +3319,7 @@ static void rs_remove_debugfs(void *priv, void *priv_sta) 
 * station is added we ignore it.

 */

static void rs_rate_init_stub(void *priv_r, struct ieee80211_supported_band *sband,

			      struct cfg80211_chan_def *chandef,

			      struct ieee80211_sta *sta, void *priv_sta)

{

}