diff options
| author | Christiano F. Haesbaert <haesbaert@cvs.openbsd.org> | 2012-10-12 19:53:25 +0000 |
|---|---|---|
| committer | Christiano F. Haesbaert <haesbaert@cvs.openbsd.org> | 2012-10-12 19:53:25 +0000 |
| commit | 15e03b4a463ed6ed94dfb27d1c84e3a97d13bbc0 (patch) | |
| tree | a6dc4ae8f17214590070296e8830af2bf2da84fa /sys | |
| parent | b38ffca2660897cf5d8ef177a6f01630b9cc7ad5 (diff) | |
Cleanup false positives for uninitialized uses.
Part of the work to remove -Wno-uninitialized.
ok blambert jsg
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/rt2860.c | 3 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwn.c | 3 | ||||
| -rw-r--r-- | sys/dev/usb/if_otus.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/if_run.c | 3 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_input.c | 5 |
5 files changed, 14 insertions, 6 deletions
diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c index 0e0666c9b69..d420a95a306 100644 --- a/sys/dev/ic/rt2860.c +++ b/sys/dev/ic/rt2860.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2860.c,v 1.66 2012/10/11 09:43:22 kettenis Exp $ */ +/* $OpenBSD: rt2860.c,v 1.67 2012/10/12 19:53:24 haesbaert Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -1515,6 +1515,7 @@ rt2860_tx(struct rt2860_softc *sc, struct mbuf *m, struct ieee80211_node *ni) tid = qos & IEEE80211_QOS_TID; qid = ieee80211_up_to_ac(ic, tid); } else { + qos = 0; tid = 0; qid = (type == IEEE80211_FC0_TYPE_MGT) ? sc->mgtqid : EDCA_AC_BE; diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index a45f0bf8096..89c115ca2bd 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.113 2012/01/26 00:45:40 deraadt Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.114 2012/10/12 19:53:24 haesbaert Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -2711,6 +2711,7 @@ iwn_tx(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni) tid = qos & IEEE80211_QOS_TID; ac = ieee80211_up_to_ac(ic, tid); } else { + qos = 0; tid = 0; ac = EDCA_AC_BE; } diff --git a/sys/dev/usb/if_otus.c b/sys/dev/usb/if_otus.c index 533cf42490a..fb08645ebb9 100644 --- a/sys/dev/usb/if_otus.c +++ b/sys/dev/usb/if_otus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_otus.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */ +/* $OpenBSD: if_otus.c,v 1.32 2012/10/12 19:53:24 haesbaert Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -1324,8 +1324,10 @@ otus_tx(struct otus_softc *sc, struct mbuf *m, struct ieee80211_node *ni) qos = ieee80211_get_qos(wh); tid = qos & IEEE80211_QOS_TID; qid = ieee80211_up_to_ac(ic, tid); - } else + } else { + qos = 0; qid = EDCA_AC_BE; + } /* Pickup a rate index. */ if (IEEE80211_IS_MULTICAST(wh->i_addr1) || diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c index c07feb924d8..dd9fcae2d20 100644 --- a/sys/dev/usb/if_run.c +++ b/sys/dev/usb/if_run.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $ */ +/* $OpenBSD: if_run.c,v 1.91 2012/10/12 19:53:24 haesbaert Exp $ */ /*- * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -2151,6 +2151,7 @@ run_tx(struct run_softc *sc, struct mbuf *m, struct ieee80211_node *ni) tid = qos & IEEE80211_QOS_TID; qid = ieee80211_up_to_ac(ic, tid); } else { + qos = 0; tid = 0; qid = EDCA_AC_BE; } diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index eb0e739fbef..bdae5b77e57 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_input.c,v 1.121 2012/07/16 14:51:31 stsp Exp $ */ +/* $OpenBSD: ieee80211_input.c,v 1.122 2012/10/12 19:53:24 haesbaert Exp $ */ /*- * Copyright (c) 2001 Atsushi Onoe @@ -276,6 +276,9 @@ ieee80211_input(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni, if ((hasqos = ieee80211_has_qos(wh))) { qos = ieee80211_get_qos(wh); tid = qos & IEEE80211_QOS_TID; + } else { + qos = 0; + tid = 0; } /* duplicate detection (see 9.2.9) */ |