Module Name: src
Committed By: christos
Date: Sat Feb 7 04:11:06 UTC 2015
Modified Files:
src/sys/dev/ic: an.c
Log Message:
set error. Reported by;
http://www.m00nbsd.net/ae123a9bae03f7dde5c6d654412daf5a.html#Report-4
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/ic/an.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/an.c
diff -u src/sys/dev/ic/an.c:1.61 src/sys/dev/ic/an.c:1.62
--- src/sys/dev/ic/an.c:1.61 Tue Feb 25 13:30:09 2014
+++ src/sys/dev/ic/an.c Fri Feb 6 23:11:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: an.c,v 1.61 2014/02/25 18:30:09 pooka Exp $ */
+/* $NetBSD: an.c,v 1.62 2015/02/07 04:11:06 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wp...@ctr.columbia.edu>. All rights reserved.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.61 2014/02/25 18:30:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.62 2015/02/07 04:11:06 christos Exp $");
#include <sys/param.h>
@@ -569,8 +569,8 @@ an_init(struct ifnet *ifp)
if (ic->ic_des_esslen)
memcpy(sc->sc_buf.sc_ssidlist.an_entry[0].an_ssid,
ic->ic_des_essid, ic->ic_des_esslen);
- if (an_write_rid(sc, AN_RID_SSIDLIST, &sc->sc_buf,
- sizeof(sc->sc_buf.sc_ssidlist)) != 0) {
+ if ((error = an_write_rid(sc, AN_RID_SSIDLIST, &sc->sc_buf,
+ sizeof(sc->sc_buf.sc_ssidlist))) != 0) {
printf("%s: failed to write ssid list\n", ifp->if_xname);
an_stop(ifp, 1);
return error;
@@ -604,8 +604,8 @@ an_init(struct ifnet *ifp)
printf("\n");
}
#endif
- if (an_write_rid(sc, AN_RID_GENCONFIG, &sc->sc_config,
- sizeof(sc->sc_config)) != 0) {
+ if ((error = an_write_rid(sc, AN_RID_GENCONFIG, &sc->sc_config,
+ sizeof(sc->sc_config))) != 0) {
printf("%s: failed to write config\n", ifp->if_xname);
an_stop(ifp, 1);
return error;
