[src/trunk]: src/sys/dev/usb Use INFRA not ADHOC when opmode is M_STA.

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

details:   https://anonhg.NetBSD.org/src/rev/47bb0fbee16b
branches:  trunk
changeset: 326748:47bb0fbee16b
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Sun Feb 16 08:17:43 2014 +0000

description:
Use INFRA not ADHOC when opmode is M_STA.

diffstat:

 sys/dev/usb/if_urtwn.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r a7ed87ab728a -r 47bb0fbee16b sys/dev/usb/if_urtwn.c
--- a/sys/dev/usb/if_urtwn.c    Sat Feb 15 22:36:26 2014 +0000
+++ b/sys/dev/usb/if_urtwn.c    Sun Feb 16 08:17:43 2014 +0000
@@ -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 @@
 
                        /* 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_write_4(sc, R92C_TCR, reg);
                         reg |= 0x01;
                         urtwn_write_4(sc, R92C_TCR, reg);
+
                         msr |= R92C_MSR_AP;
                        break;
                 }