Commit 15ecf7a0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-davem-2015-01-06' of... 

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



Here's just a single fix - a revert of a patch that broke the
p54 and cw2100 drivers (arguably due to bad assumptions there.)
Since this affects kernels since 3.17, I decided to revert for
now and we'll revisit this optimisation properly for -next.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a5e31255 1e359a5d

include/net/mac80211.h

+2 −5
Original line number Diff line number Diff line
@@ -1270,8 +1270,7 @@ struct ieee80211_vif *wdev_to_ieee80211_vif(struct wireless_dev *wdev); 
 *

 * @IEEE80211_KEY_FLAG_GENERATE_IV: This flag should be set by the

 *	driver to indicate that it requires IV generation for this

 *	particular key. Setting this flag does not necessarily mean that SKBs

 *	will have sufficient tailroom for ICV or MIC.

 *	particular key.

 * @IEEE80211_KEY_FLAG_GENERATE_MMIC: This flag should be set by

 *	the driver for a TKIP key if it requires Michael MIC

 *	generation in software.
@@ -1283,9 +1282,7 @@ struct ieee80211_vif *wdev_to_ieee80211_vif(struct wireless_dev *wdev); 
 * @IEEE80211_KEY_FLAG_PUT_IV_SPACE: This flag should be set by the driver

 *	if space should be prepared for the IV, but the IV

 *	itself should not be generated. Do not set together with

 *	@IEEE80211_KEY_FLAG_GENERATE_IV on the same key. Setting this flag does

 *	not necessarily mean that SKBs will have sufficient tailroom for ICV or

 *	MIC.

 *	@IEEE80211_KEY_FLAG_GENERATE_IV on the same key.

 * @IEEE80211_KEY_FLAG_RX_MGMT: This key will be used to decrypt received

 *	management frames. The flag can help drivers that have a hardware

 *	crypto implementation that doesn't deal with management frames

net/mac80211/key.c

+9 −3
Original line number Diff line number Diff line
@@ -140,7 +140,9 @@ static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key) 
	if (!ret) {

		key->flags |= KEY_FLAG_UPLOADED_TO_HARDWARE;



		if (!(key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_MMIC))

		if (!((key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_MMIC) ||

		      (key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV) ||

		      (key->conf.flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE)))

			sdata->crypto_tx_tailroom_needed_cnt--;



		WARN_ON((key->conf.flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE) &&
@@ -188,7 +190,9 @@ static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key) 
	sta = key->sta;

	sdata = key->sdata;



	if (!(key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_MMIC))

	if (!((key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_MMIC) ||

	      (key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV) ||

	      (key->conf.flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE)))

		increment_tailroom_need_count(sdata);



	ret = drv_set_key(key->local, DISABLE_KEY, sdata,
@@ -884,7 +888,9 @@ void ieee80211_remove_key(struct ieee80211_key_conf *keyconf) 
	if (key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) {

		key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE;



		if (!(key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_MMIC))

		if (!((key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_MMIC) ||

		      (key->conf.flags & IEEE80211_KEY_FLAG_GENERATE_IV) ||

		      (key->conf.flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE)))

			increment_tailroom_need_count(key->sdata);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE