Commit 1e359a5d authored by Johannes Berg's avatar Johannes Berg
Browse files

Revert "mac80211: Fix accounting of the tailroom-needed counter" 

This reverts commit ca34e3b5.

It turns out that the p54 and cw2100 drivers assume that there's
tailroom even when they don't say they really need it. However,
there's currently no way for them to explicitly say they do need
it, so for now revert this.

This fixes https://bugzilla.kernel.org/show_bug.cgi?id=90331

.

Cc: stable@vger.kernel.org
Fixes: ca34e3b5 ("mac80211: Fix accounting of the tailroom-needed counter")
Reported-by: default avatarChristopher Chavez <chrischavez@gmx.us>
Bisected-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Debugged-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 28a9bc68

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