Deleted Added
full compact
ieee80211_adhoc.c (260444) ieee80211_adhoc.c (271861)
1/*-
2 * Copyright (c) 2007-2009 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-2009 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_adhoc.c 260444 2014-01-08 08:06:56Z kevlo $");
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_adhoc.c 271861 2014-09-19 09:20:55Z glebius $");
29#endif
30
31/*
32 * IEEE 802.11 IBSS mode support.
33 */
34#include "opt_inet.h"
35#include "opt_wlan.h"
36

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

648
649 default:
650 IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
651 wh, "bad", "frame type 0x%x", type);
652 /* should not come here */
653 break;
654 }
655err:
29#endif
30
31/*
32 * IEEE 802.11 IBSS mode support.
33 */
34#include "opt_inet.h"
35#include "opt_wlan.h"
36

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

648
649 default:
650 IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
651 wh, "bad", "frame type 0x%x", type);
652 /* should not come here */
653 break;
654 }
655err:
656 ifp->if_ierrors++;
656 if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
657out:
658 if (m != NULL) {
659 if (need_tap && ieee80211_radiotap_active_vap(vap))
660 ieee80211_radiotap_rx(vap, m);
661 m_freem(m);
662 }
663 return type;
664}

--- 294 unchanged lines hidden ---
657out:
658 if (m != NULL) {
659 if (need_tap && ieee80211_radiotap_active_vap(vap))
660 ieee80211_radiotap_rx(vap, m);
661 m_freem(m);
662 }
663 return type;
664}

--- 294 unchanged lines hidden ---