| mwlhal.c (195171) | mwlhal.c (216835) |
|---|---|
| 1/*- 2 * Copyright (c) 2007-2009 Sam Leffler, Errno Consulting 3 * Copyright (c) 2007-2009 Marvell Semiconductor, Inc. 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 13 unchanged lines hidden (view full) --- 22 * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, 23 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 26 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 28 * THE POSSIBILITY OF SUCH DAMAGES. 29 * | 1/*- 2 * Copyright (c) 2007-2009 Sam Leffler, Errno Consulting 3 * Copyright (c) 2007-2009 Marvell Semiconductor, Inc. 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 13 unchanged lines hidden (view full) --- 22 * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, 23 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER 26 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 28 * THE POSSIBILITY OF SUCH DAMAGES. 29 * |
| 30 * $FreeBSD: head/sys/dev/mwl/mwlhal.c 195171 2009-06-29 18:42:54Z sam $ | 30 * $FreeBSD: head/sys/dev/mwl/mwlhal.c 216835 2010-12-31 09:50:15Z bschmidt $ |
| 31 */ 32 33#include <sys/param.h> 34#include <sys/systm.h> 35#include <sys/sysctl.h> 36#include <sys/malloc.h> 37#include <sys/lock.h> 38#include <sys/mutex.h> --- 235 unchanged lines hidden (view full) --- 274 hvap->vap_type = MWL_HAL_AP; 275 hvap->bss_type = htole16(WL_MAC_TYPE_SECONDARY_AP); 276 hvap->macid = i; 277 } 278 hvap = &mh->mh_vaps[i]; 279 hvap->vap_type = MWL_HAL_STA; 280 hvap->bss_type = htole16(WL_MAC_TYPE_PRIMARY_CLIENT); 281 hvap->macid = i; | 31 */ 32 33#include <sys/param.h> 34#include <sys/systm.h> 35#include <sys/sysctl.h> 36#include <sys/malloc.h> 37#include <sys/lock.h> 38#include <sys/mutex.h> --- 235 unchanged lines hidden (view full) --- 274 hvap->vap_type = MWL_HAL_AP; 275 hvap->bss_type = htole16(WL_MAC_TYPE_SECONDARY_AP); 276 hvap->macid = i; 277 } 278 hvap = &mh->mh_vaps[i]; 279 hvap->vap_type = MWL_HAL_STA; 280 hvap->bss_type = htole16(WL_MAC_TYPE_PRIMARY_CLIENT); 281 hvap->macid = i; |
| 282 for (i++; i < MWL_MBSS_STA_MAX; i++) { | 282 for (i++; i < MWL_MBSS_MAX; i++) { |
| 283 hvap = &mh->mh_vaps[i]; 284 hvap->vap_type = MWL_HAL_STA; 285 hvap->bss_type = htole16(WL_MAC_TYPE_SECONDARY_CLIENT); 286 hvap->macid = i; 287 } 288 mh->mh_revs.mh_devid = devid; 289 snprintf(mh->mh_mtxname, sizeof(mh->mh_mtxname), 290 "%s_hal", device_get_nameunit(dev)); --- 2496 unchanged lines hidden --- | 283 hvap = &mh->mh_vaps[i]; 284 hvap->vap_type = MWL_HAL_STA; 285 hvap->bss_type = htole16(WL_MAC_TYPE_SECONDARY_CLIENT); 286 hvap->macid = i; 287 } 288 mh->mh_revs.mh_devid = devid; 289 snprintf(mh->mh_mtxname, sizeof(mh->mh_mtxname), 290 "%s_hal", device_get_nameunit(dev)); --- 2496 unchanged lines hidden --- |