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

Commit 0e00a0f7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-next-for-davem-2015-05-06' of... 

Merge tag 'mac80211-next-for-davem-2015-05-06' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg says:

====================
Lots of updates for net-next for this cycle. As usual, we have
a lot of small fixes and cleanups, the bigger items are:
 * proper mac80211 rate control locking, to fix some random crashes
   (this required changing other locking as well)
 * mac80211 "fast-xmit", a mechanism to reduce, in most cases, the
   amount of code we execute while going from ndo_start_xmit() to
   the driver
 * this also clears the way for properly supporting S/G and checksum
   and segmentation offloads
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 82ae9c60 bbbe8c8c

drivers/net/wireless/adm8211.c

+1 −6
Original line number Diff line number Diff line
@@ -1353,12 +1353,7 @@ static void adm8211_configure_filter(struct ieee80211_hw *dev, 


	new_flags = 0;



	if (*total_flags & FIF_PROMISC_IN_BSS) {

		new_flags |= FIF_PROMISC_IN_BSS;

		priv->nar |= ADM8211_NAR_PR;

		priv->nar &= ~ADM8211_NAR_MM;

		mc_filter[1] = mc_filter[0] = ~0;

	} else if (*total_flags & FIF_ALLMULTI || multicast == ~(0ULL)) {

	if (*total_flags & FIF_ALLMULTI || multicast == ~(0ULL)) {

		new_flags |= FIF_ALLMULTI;

		priv->nar &= ~ADM8211_NAR_PR;

		priv->nar |= ADM8211_NAR_MM;

drivers/net/wireless/at76c50x-usb.h

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ struct at76_priv { 
	int mac80211_registered;

};



#define AT76_SUPPORTED_FILTERS FIF_PROMISC_IN_BSS

#define AT76_SUPPORTED_FILTERS 0



#define SCAN_POLL_INTERVAL	(HZ / 4)

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

+1 −2
Original line number Diff line number Diff line
@@ -1319,8 +1319,7 @@ static void ar5523_bss_info_changed(struct ieee80211_hw *hw, 


}



#define AR5523_SUPPORTED_FILTERS (FIF_PROMISC_IN_BSS | \

				  FIF_ALLMULTI | \

#define AR5523_SUPPORTED_FILTERS (FIF_ALLMULTI | \

				  FIF_FCSFAIL | \

				  FIF_OTHER_BSS)

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

+3 −4
Original line number Diff line number Diff line
@@ -773,7 +773,6 @@ static int ath10k_monitor_recalc(struct ath10k *ar) 
	lockdep_assert_held(&ar->conf_mutex);



	should_start = ar->monitor ||

		       ar->filter_flags & FIF_PROMISC_IN_BSS ||

		       test_bit(ATH10K_CAC_RUNNING, &ar->dev_flags);



	ath10k_dbg(ar, ATH10K_DBG_MAC,
@@ -3493,8 +3492,7 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw, 
 * FIXME: Has to be verified.

 */

#define SUPPORTED_FILTERS			\

	(FIF_PROMISC_IN_BSS |			\

	FIF_ALLMULTI |				\

	(FIF_ALLMULTI |				\

	FIF_CONTROL |				\

	FIF_PSPOLL |				\

	FIF_OTHER_BSS |				\
@@ -5500,7 +5498,8 @@ int ath10k_mac_register(struct ath10k *ar) 
			IEEE80211_HW_HAS_RATE_CONTROL |

			IEEE80211_HW_AP_LINK_PS |

			IEEE80211_HW_SPECTRUM_MGMT |

			IEEE80211_HW_SW_CRYPTO_CONTROL;

			IEEE80211_HW_SW_CRYPTO_CONTROL |

			IEEE80211_HW_SUPPORT_FAST_XMIT;



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

drivers/net/wireless/ath/ath5k/ath5k.h

+0 −1
Original line number Diff line number Diff line
@@ -1280,7 +1280,6 @@ struct ath5k_hw { 


	DECLARE_BITMAP(status, 4);

#define ATH_STAT_INVALID	0		/* disable hardware accesses */

#define ATH_STAT_PROMISC	1

#define ATH_STAT_LEDSOFT	2		/* enable LED gpio status */

#define ATH_STAT_STARTED	3		/* opened & irqs enabled */

#define ATH_STAT_RESET		4		/* hw reset */