Deleted Added
full compact
ieee80211.c (193337) ieee80211.c (193340)
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2009 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:

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2009 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:

--- 11 unchanged lines hidden (view full) ---

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211.c 193337 2009-06-02 18:55:27Z sam $");
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211.c 193340 2009-06-02 20:00:43Z sam $");
29
30/*
31 * IEEE 802.11 generic handler
32 */
33#include "opt_wlan.h"
34
35#include <sys/param.h>
36#include <sys/systm.h>

--- 1144 unchanged lines hidden (view full) ---

1181 struct ieee80211vap *vap = ifp->if_softc;
1182 struct ifmedia_entry *ime = vap->iv_media.ifm_cur;
1183 uint16_t newmode;
1184
1185 if (!media2mode(ime, vap->iv_flags, &newmode))
1186 return EINVAL;
1187 if (vap->iv_des_mode != newmode) {
1188 vap->iv_des_mode = newmode;
29
30/*
31 * IEEE 802.11 generic handler
32 */
33#include "opt_wlan.h"
34
35#include <sys/param.h>
36#include <sys/systm.h>

--- 1144 unchanged lines hidden (view full) ---

1181 struct ieee80211vap *vap = ifp->if_softc;
1182 struct ifmedia_entry *ime = vap->iv_media.ifm_cur;
1183 uint16_t newmode;
1184
1185 if (!media2mode(ime, vap->iv_flags, &newmode))
1186 return EINVAL;
1187 if (vap->iv_des_mode != newmode) {
1188 vap->iv_des_mode = newmode;
1189 return ENETRESET;
1189 /* XXX kick state machine if up+running */
1190 }
1191 return 0;
1192}
1193
1194/*
1195 * Common code to calculate the media status word
1196 * from the operating mode and channel state.
1197 */

--- 329 unchanged lines hidden ---
1190 }
1191 return 0;
1192}
1193
1194/*
1195 * Common code to calculate the media status word
1196 * from the operating mode and channel state.
1197 */

--- 329 unchanged lines hidden ---