Deleted Added
full compact
ieee80211_sta.c (193966) ieee80211_sta.c (195377)
1/*-
2 * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
27#ifdef __FreeBSD__
1/*-
2 * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
27#ifdef __FreeBSD__
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_sta.c 193966 2009-06-11 04:43:42Z sam $");
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_sta.c 195377 2009-07-05 17:59:19Z sam $");
29#endif
30
31/*
32 * IEEE 802.11 Station mode support.
33 */
34#include "opt_inet.h"
35#include "opt_wlan.h"
36

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

1712 "recv disassociate (reason %d)", reason);
1713 ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0);
1714 break;
1715 }
1716
1717 case IEEE80211_FC0_SUBTYPE_ACTION:
1718 if (vap->iv_state == IEEE80211_S_RUN) {
1719 if (ieee80211_parse_action(ni, m0) == 0)
29#endif
30
31/*
32 * IEEE 802.11 Station mode support.
33 */
34#include "opt_inet.h"
35#include "opt_wlan.h"
36

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

1712 "recv disassociate (reason %d)", reason);
1713 ieee80211_new_state(vap, IEEE80211_S_ASSOC, 0);
1714 break;
1715 }
1716
1717 case IEEE80211_FC0_SUBTYPE_ACTION:
1718 if (vap->iv_state == IEEE80211_S_RUN) {
1719 if (ieee80211_parse_action(ni, m0) == 0)
1720 ic->ic_recv_action(ni, frm, efrm);
1720 ic->ic_recv_action(ni, wh, frm, efrm);
1721 } else
1722 vap->iv_stats.is_rx_mgtdiscard++;
1723 break;
1724
1725 case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
1726 case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
1727 case IEEE80211_FC0_SUBTYPE_REASSOC_REQ:
1728 vap->iv_stats.is_rx_mgtdiscard++;

--- 15 unchanged lines hidden ---
1721 } else
1722 vap->iv_stats.is_rx_mgtdiscard++;
1723 break;
1724
1725 case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
1726 case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
1727 case IEEE80211_FC0_SUBTYPE_REASSOC_REQ:
1728 vap->iv_stats.is_rx_mgtdiscard++;

--- 15 unchanged lines hidden ---