d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wpi(4): fix 'maybe uninitialized' warnings

Browse Source 
Submitted by:	<s3erios@gmail.com>
Differential Revision:	https://reviews.freebsd.org/D3760
This commit is contained in:
adrian 2015-10-08 07:20:22 +00:00
parent 8947a584e4
commit 06482ca40d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/wpi/if_wpi.c
View File

@ -2731,6 +2731,7 @@ wpi_tx_data(struct wpi_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
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 mbuf *m, struct ieee80211_node *ni)
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, struct mbuf *m,
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, struct mbuf *m,
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;