D3760.id9235.diff
No OneTemporary
Actions

Size

1019 B

Referenced Files

None

Subscribers

None

D3760.id9235.diff
View Options

	Index: head/sys/dev/wpi/if_wpi.c
	===================================================================
	--- head/sys/dev/wpi/if_wpi.c
	+++ head/sys/dev/wpi/if_wpi.c
	@@ -2731,6 +2731,7 @@
	wh = mtod(m, struct ieee80211_frame *);
	type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
	ismcast = IEEE80211_IS_MULTICAST(wh->i_addr1);
	+ swcrypt = 1;

	/* Select EDCA Access Category and TX ring for this frame. */
	if (IEEE80211_QOS_HAS_SEQ(wh)) {
	@@ -2844,7 +2845,7 @@
	tx->id = wn->id;
	}

	- if (k != NULL && !swcrypt) {
	+ if (!swcrypt) {
	switch (k->wk_cipher->ic_cipher) {
	case IEEE80211_CIPHER_AES_CCM:
	tx->security = WPI_CIPHER_CCMP;
	@@ -2894,6 +2895,7 @@

	wh = mtod(m, struct ieee80211_frame *);
	type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
	+ swcrypt = 1;

	ac = params->ibp_pri & 3;

	@@ -2952,7 +2954,7 @@
	tx->timeout = htole16(2);
	}

	- if (k != NULL && !swcrypt) {
	+ if (!swcrypt) {
	switch (k->wk_cipher->ic_cipher) {
	case IEEE80211_CIPHER_AES_CCM:
	tx->security = WPI_CIPHER_CCMP;