Module Name: src
Committed By: nonaka
Date: Sun Feb 16 08:17:43 UTC 2014
Modified Files:
src/sys/dev/usb: if_urtwn.c
Log Message:
Use INFRA not ADHOC when opmode is M_STA.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/usb/if_urtwn.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/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.26 src/sys/dev/usb/if_urtwn.c:1.27
--- src/sys/dev/usb/if_urtwn.c:1.26 Fri Feb 14 04:17:41 2014
+++ src/sys/dev/usb/if_urtwn.c Sun Feb 16 08:17:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.26 2014/02/14 04:17:41 christos Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.27 2014/02/16 08:17:43 nonaka Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.26 2014/02/14 04:17:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.27 2014/02/16 08:17:43 nonaka Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1768,7 +1768,9 @@ urtwn_newstate_cb(struct urtwn_softc *sc
/* Enable TSF synchronization. */
urtwn_tsf_sync_enable(sc);
- /*FALLTHROUGH*/
+
+ msr |= R92C_MSR_INFRA;
+ break;
default:
msr |= R92C_MSR_ADHOC;
break;
@@ -1786,6 +1788,7 @@ urtwn_newstate_cb(struct urtwn_softc *sc
urtwn_write_4(sc, R92C_TCR, reg);
reg |= 0x01;
urtwn_write_4(sc, R92C_TCR, reg);
+
msr |= R92C_MSR_AP;
break;
}
