| ieee80211.c (140915) | ieee80211.c (148290) |
|---|---|
| 1/*- 2 * Copyright (c) 2001 Atsushi Onoe 3 * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting 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: --- 17 unchanged lines hidden (view full) --- 26 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 31 */ 32 33#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2001 Atsushi Onoe 3 * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting 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: --- 17 unchanged lines hidden (view full) --- 26 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 31 */ 32 33#include <sys/cdefs.h> |
| 34__FBSDID("$FreeBSD: head/sys/net80211/ieee80211.c 140915 2005-01-27 17:39:17Z sam $"); | 34__FBSDID("$FreeBSD: head/sys/net80211/ieee80211.c 148290 2005-07-22 16:50:18Z sam $"); |
| 35 36/* 37 * IEEE 802.11 generic handler 38 */ 39 40#include <sys/param.h> 41#include <sys/systm.h> 42#include <sys/kernel.h> --- 617 unchanged lines hidden (view full) --- 660 } 661 imr->ifm_status = IFM_AVALID; 662 imr->ifm_active = IFM_IEEE80211; 663 if (ic->ic_state == IEEE80211_S_RUN) 664 imr->ifm_status |= IFM_ACTIVE; 665 /* 666 * Calculate a current rate if possible. 667 */ | 35 36/* 37 * IEEE 802.11 generic handler 38 */ 39 40#include <sys/param.h> 41#include <sys/systm.h> 42#include <sys/kernel.h> --- 617 unchanged lines hidden (view full) --- 660 } 661 imr->ifm_status = IFM_AVALID; 662 imr->ifm_active = IFM_IEEE80211; 663 if (ic->ic_state == IEEE80211_S_RUN) 664 imr->ifm_status |= IFM_ACTIVE; 665 /* 666 * Calculate a current rate if possible. 667 */ |
| 668 if (ic->ic_fixed_rate != -1) { | 668 if (ic->ic_fixed_rate != IEEE80211_FIXED_RATE_NONE) { |
| 669 /* 670 * A fixed rate is set, report that. 671 */ 672 rs = &ic->ic_sup_rates[ic->ic_curmode]; 673 imr->ifm_active |= ieee80211_rate2media(ic, 674 rs->rs_rates[ic->ic_fixed_rate], ic->ic_curmode); 675 } else if (ic->ic_opmode == IEEE80211_M_STA) { 676 /* --- 338 unchanged lines hidden --- | 669 /* 670 * A fixed rate is set, report that. 671 */ 672 rs = &ic->ic_sup_rates[ic->ic_curmode]; 673 imr->ifm_active |= ieee80211_rate2media(ic, 674 rs->rs_rates[ic->ic_fixed_rate], ic->ic_curmode); 675 } else if (ic->ic_opmode == IEEE80211_M_STA) { 676 /* --- 338 unchanged lines hidden --- |