From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 29 Mar 2010 13:07:18 +0000 (+0100)
Subject: Merge branch 'master' into net80211-update
X-Git-Tag: v2.7.1~38^2~13
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/1b2c87ca31619b40819b35bc5430c95daea509a2

Merge branch 'master' into net80211-update

Conflicts:
	sys/conf/options
---

1b2c87ca31619b40819b35bc5430c95daea509a2
diff --cc sys/conf/options
index 829c17c2e6,7cac8cd2af..bf12b62ee5
--- a/sys/conf/options
+++ b/sys/conf/options
@@@ -669,25 -669,4 +669,26 @@@ WATCHDOG_ENABLE	opt_cpu.
  # Panic settings
  WDOG_DISABLE_ON_PANIC	opt_panic.h
  ERROR_LED_ON_PANIC	opt_panic.h
 +
 +# 802.11 support layer
 +IEEE80211_DEBUG		opt_wlan.h
 +IEEE80211_DEBUG_REFCNT	opt_wlan.h
 +IEEE80211_AMPDU_AGE	opt_wlan.h
 +IEEE80211_SUPPORT_MESH	opt_wlan.h
 +IEEE80211_SUPPORT_SUPERG	opt_wlan.h
 +IEEE80211_SUPPORT_TDMA	opt_wlan.h
 +
 +# 802.11 TDMA support
 +TDMA_SLOTLEN_DEFAULT	opt_tdma.h
 +TDMA_SLOTCNT_DEFAULT	opt_tdma.h
 +TDMA_BINTVAL_DEFAULT	opt_tdma.h
 +TDMA_TXRATE_11B_DEFAULT	opt_tdma.h
 +TDMA_TXRATE_11G_DEFAULT	opt_tdma.h
 +TDMA_TXRATE_11A_DEFAULT	opt_tdma.h
 +TDMA_TXRATE_TURBO_DEFAULT	opt_tdma.h
 +TDMA_TXRATE_HALF_DEFAULT	opt_tdma.h
 +TDMA_TXRATE_QUARTER_DEFAULT	opt_tdma.h
 +TDMA_TXRATE_11NA_DEFAULT	opt_tdma.h
 +TDMA_TXRATE_11NG_DEFAULT	opt_tdma.h
 +
+ PANIC_REBOOT_WAIT_TIME	opt_panic.h