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

Commit 71bbe25d authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-next-for-davem-2016-04-13' of... 

Merge tag 'mac80211-next-for-davem-2016-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg says:

====================
To synchronize with Kalle, here's just a big change that affects
all drivers - removing the duplicated enum ieee80211_band and
replacing it by enum nl80211_band. On top of that, just a small
documentation update.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7d45a04c 57fbcce3

Documentation/DocBook/80211.tmpl

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ 
      <chapter>

      <title>Device registration</title>

!Pinclude/net/cfg80211.h Device registration

!Finclude/net/cfg80211.h ieee80211_band

!Finclude/net/cfg80211.h ieee80211_channel_flags

!Finclude/net/cfg80211.h ieee80211_channel

!Finclude/net/cfg80211.h ieee80211_rate_flags

drivers/net/wireless/admtek/adm8211.c

+2 −2
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ static void adm8211_interrupt_rci(struct ieee80211_hw *dev) 
			rx_status.rate_idx = rate;



			rx_status.freq = adm8211_channels[priv->channel - 1].center_freq;

			rx_status.band = IEEE80211_BAND_2GHZ;

			rx_status.band = NL80211_BAND_2GHZ;



			memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, sizeof(rx_status));

			ieee80211_rx_irqsafe(dev, skb);
@@ -1894,7 +1894,7 @@ static int adm8211_probe(struct pci_dev *pdev, 


	priv->channel = 1;



	dev->wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->band;

	dev->wiphy->bands[NL80211_BAND_2GHZ] = &priv->band;



	err = ieee80211_register_hw(dev);

	if (err) {

drivers/net/wireless/ath/ar5523/ar5523.c

+2 −2
Original line number Diff line number Diff line
@@ -1471,12 +1471,12 @@ static int ar5523_init_modes(struct ar5523 *ar) 
	memcpy(ar->channels, ar5523_channels, sizeof(ar5523_channels));

	memcpy(ar->rates, ar5523_rates, sizeof(ar5523_rates));



	ar->band.band = IEEE80211_BAND_2GHZ;

	ar->band.band = NL80211_BAND_2GHZ;

	ar->band.channels = ar->channels;

	ar->band.n_channels = ARRAY_SIZE(ar5523_channels);

	ar->band.bitrates = ar->rates;

	ar->band.n_bitrates = ARRAY_SIZE(ar5523_rates);

	ar->hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &ar->band;

	ar->hw->wiphy->bands[NL80211_BAND_2GHZ] = &ar->band;

	return 0;

}

drivers/net/wireless/ath/ath.h

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ struct ath_common { 
	bool bt_ant_diversity;



	int last_rssi;

	struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];

	struct ieee80211_supported_band sbands[NUM_NL80211_BANDS];

};



static inline const struct ath_ps_ops *ath_ps_ops(struct ath_common *common)

drivers/net/wireless/ath/ath10k/core.h

+1 −1
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ struct ath10k { 
	} scan;



	struct {

		struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];

		struct ieee80211_supported_band sbands[NUM_NL80211_BANDS];

	} mac;



	/* should never be NULL; needed for regular htt rx */