diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/Kconfig | 19 | ||||
| -rw-r--r-- | net/Makefile | 7 | ||||
| l--------- | net/compat-wireless-openmac | 1 |
3 files changed, 26 insertions, 1 deletions
diff --git a/net/Kconfig b/net/Kconfig index 9a68cc0b5c9..c73b0762bf1 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -334,12 +334,24 @@ config COMPAT_WIRELESS To compile this code as a module, choose M here. if COMPAT_WIRELESS +config COMPAT_WIRELESS_MODULES + tristate "Wireless modules" + default n + ---help--- + To compile this code as a module, choose M here. + config CFG80211 tristate "Compat CFG80211" default n ---help--- To compile this code as a module, choose M here. +config MAC80211 + tristate "Compat MAC80211" + default n + ---help--- + To compile this code as a module, choose M here. + config COMPAT_MAC80211_RC_DEFAULT string "MAC80211_RC_DEFAULT" default "minstrel" @@ -387,6 +399,13 @@ config MAC80211_RC_MINSTREL default y ---help--- +config MAC80211_RC_MINSTREL_HT + bool "Minstrel 802.11n support" if EXPERT + depends on MAC80211_RC_MINSTREL + default y + ---help--- + This option enables the 'minstrel_ht' TX rate control algorithm + config MAC80211_LEDS bool "MAC80211_LEDS" depends on COMPAT_WIRELESS diff --git a/net/Makefile b/net/Makefile index 87cfc364a68..b6d42169585 100644 --- a/net/Makefile +++ b/net/Makefile @@ -49,7 +49,12 @@ obj-$(CONFIG_IP_DCCP) += dccp/ obj-$(CONFIG_IP_SCTP) += sctp/ obj-$(CONFIG_RDS) += rds/ ifneq ($(CONFIG_COMPAT_WIRELESS),) -obj-$(CONFIG_COMPAT_WIRELESS) += compat-wireless/ +# If MAC80211 is disabled use UMAC +ifneq ($(CONFIG_MAC80211),) +obj-$(CONFIG_COMPAT_WIRELESS) += compat-wireless-openmac/ +else +obj-$(CONFIG_COMPAT_WIRELESS) += compat-wireless/ +endif else obj-$(CONFIG_WIRELESS) += wireless/ obj-$(CONFIG_MAC80211) += mac80211/ diff --git a/net/compat-wireless-openmac b/net/compat-wireless-openmac new file mode 120000 index 00000000000..51c37423584 --- /dev/null +++ b/net/compat-wireless-openmac @@ -0,0 +1 @@ +../../vendor/st-ericsson/connectivity/wlan/compat-wireless-openmac/
\ No newline at end of file |