[src-draft/trunk]: src/sys/net80211 Pass the error through to the hardware to...

[nat <nat%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src-all/rev/d40e924897fd
branches:  trunk
changeset: 951176:d40e924897fd
user:      nat <nat%NetBSD.org@localhost>
date:      Mon Apr 27 07:45:57 2020 +0000

description:
Pass the error through to the hardware to initialize.

diffstat:

 sys/net80211/ieee80211_ioctl.c |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (37 lines):

diff -r 1a7c2fe67a60 -r d40e924897fd sys/net80211/ieee80211_ioctl.c
--- a/sys/net80211/ieee80211_ioctl.c    Sun Apr 26 13:13:40 2020 +0200
+++ b/sys/net80211/ieee80211_ioctl.c    Mon Apr 27 07:45:57 2020 +0000
@@ -1,4 +1,8 @@
+<<<<<<< /home/martin/wifi/sys/net80211/ieee80211_ioctl.c
 /*     $NetBSD: ieee80211_ioctl.c,v 1.67 2019/11/10 21:16:38 chs Exp $ */
+=======
+/*     $NetBSD: ieee80211_ioctl.c,v 1.60.18.10 2020/04/27 07:45:57 nat Exp $   */
+>>>>>>> /tmp/ieee80211_ioctl~other.64lkr62w.c
 
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -33,7 +37,11 @@
 __FBSDID("$FreeBSD: head/sys/net80211/ieee80211_ioctl.c 331797 2018-03-30 18:50:13Z brooks $");
 #endif
 #ifdef __NetBSD__
+<<<<<<< /home/martin/wifi/sys/net80211/ieee80211_ioctl.c
 __KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.67 2019/11/10 21:16:38 chs Exp $");
+=======
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.60.18.10 2020/04/27 07:45:57 nat Exp $");
+>>>>>>> /tmp/ieee80211_ioctl~other.64lkr62w.c
 #endif
 
 /*
@@ -3641,11 +3649,11 @@
                if (IS_UP_AUTO(vap))
 #if __FreeBSD__
                        ieee80211_init(vap);
+               error = 0;
 #elif __NetBSD__
                        /* arg is a vap in 802.11 code */ 
                        ieee80211_init((struct ifnet *)vap);
 #endif
-               error = 0;
        }
        return error;
 }