Deleted Added
full compact
ieee80211_ht.c (228621) ieee80211_ht.c (229284)
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_ht.c 228621 2011-12-17 10:23:17Z bschmidt $");
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_ht.c 229284 2012-01-02 16:02:30Z bschmidt $");
29#endif
30
31/*
32 * IEEE 802.11n protocol support.
33 */
34
35#include "opt_inet.h"
36#include "opt_wlan.h"

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

428} while (0)
429 int i;
430
431 memset(&htrateset, 0, sizeof(struct ieee80211_htrateset));
432 for (i = 0; i < ic->ic_txstream * 8; i++)
433 ADDRATE(i);
434 if ((ic->ic_htcaps & IEEE80211_HTCAP_CHWIDTH40) &&
435 (ic->ic_htcaps & IEEE80211_HTC_TXMCS32))
29#endif
30
31/*
32 * IEEE 802.11n protocol support.
33 */
34
35#include "opt_inet.h"
36#include "opt_wlan.h"

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

428} while (0)
429 int i;
430
431 memset(&htrateset, 0, sizeof(struct ieee80211_htrateset));
432 for (i = 0; i < ic->ic_txstream * 8; i++)
433 ADDRATE(i);
434 if ((ic->ic_htcaps & IEEE80211_HTCAP_CHWIDTH40) &&
435 (ic->ic_htcaps & IEEE80211_HTC_TXMCS32))
436 ADDRATE(i);
436 ADDRATE(32);
437 if (ic->ic_htcaps & IEEE80211_HTC_TXUNEQUAL) {
438 if (ic->ic_txstream >= 2) {
439 for (i = 33; i <= 38; i++)
440 ADDRATE(i);
441 }
442 if (ic->ic_txstream >= 3) {
443 for (i = 39; i <= 52; i++)
444 ADDRATE(i);

--- 2338 unchanged lines hidden ---
437 if (ic->ic_htcaps & IEEE80211_HTC_TXUNEQUAL) {
438 if (ic->ic_txstream >= 2) {
439 for (i = 33; i <= 38; i++)
440 ADDRATE(i);
441 }
442 if (ic->ic_txstream >= 3) {
443 for (i = 39; i <= 52; i++)
444 ADDRATE(i);

--- 2338 unchanged lines hidden ---