From: Sascha Wildner <saw@online.de>
Date: Mon, 12 Dec 2011 18:11:01 +0000 (+0100)
Subject: ndis_events(8): Handle the "no event matched" case (fixes a gcc41 warning).
X-Git-Tag: v3.0.0~417
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/8533325e0dcd81f2514bc50a75c0ea126ab7a586

ndis_events(8): Handle the "no event matched" case (fixes a gcc41 warning).
---

diff --git a/usr.sbin/802_11/ndis_events/ndis_events.c b/usr.sbin/802_11/ndis_events/ndis_events.c
index 76797e812e..7cab62c02e 100644
--- a/usr.sbin/802_11/ndis_events/ndis_events.c
+++ b/usr.sbin/802_11/ndis_events/ndis_events.c
@@ -203,8 +203,7 @@ announce_event(char *ifname, int sock, struct sockaddr_in *dst)
 			close(s);
 			return(0);
 		}
-	}
-	if (e->ne_sts == NDIS_STATUS_MEDIA_DISCONNECT) {
+	} else if (e->ne_sts == NDIS_STATUS_MEDIA_DISCONNECT) {
 		type = EVENT_DISCONNECT;
 		if (verbose)
 			dbgmsg("Received a disconnect event for %s", ifname);
@@ -212,12 +211,14 @@ announce_event(char *ifname, int sock, struct sockaddr_in *dst)
 			close(s);
 			return(0);
 		}
-	}
-	if (e->ne_sts == NDIS_STATUS_MEDIA_SPECIFIC_INDICATION) {
+	} else if (e->ne_sts == NDIS_STATUS_MEDIA_SPECIFIC_INDICATION) {
 		type = EVENT_MEDIA_SPECIFIC;
 		if (verbose)
 			dbgmsg("Received a media-specific event for %s",
 			    ifname);
+	} else {
+		dbgmsg("unknown event %u\n", e->ne_sts);
+		return(EINVAL);
 	}
 
 	end = buf + sizeof(buf);