Author: adrian Date: Thu Oct 8 07:20:22 2015 New Revision: 289010 URL: https://svnweb.freebsd.org/changeset/base/289010
Log: wpi(4): fix 'maybe uninitialized' warnings Submitted by: <s3er...@gmail.com> Differential Revision: https://reviews.freebsd.org/D3760 Modified: head/sys/dev/wpi/if_wpi.c Modified: head/sys/dev/wpi/if_wpi.c ============================================================================== --- head/sys/dev/wpi/if_wpi.c Thu Oct 8 07:19:57 2015 (r289009) +++ head/sys/dev/wpi/if_wpi.c Thu Oct 8 07:20:22 2015 (r289010) @@ -2731,6 +2731,7 @@ wpi_tx_data(struct wpi_softc *sc, struct 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 @@ wpi_tx_data(struct wpi_softc *sc, struct 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 @@ wpi_tx_data_raw(struct wpi_softc *sc, st 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 @@ wpi_tx_data_raw(struct wpi_softc *sc, st 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; _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
