From 442b9d46bb8bb06c9c9ee1fb16cb2bb7398fd430 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 17 Apr 2012 00:05:41 +0000 Subject: ath9k/ath5k: fix driver load issues with mesh support compiled out git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31326 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/mac80211/patches/300-pending_work.patch | 32 +++++++++++++--------- .../patches/410-ath9k_allow_adhoc_and_ap.patch | 12 ++++---- .../patches/411-ath5k_allow_adhoc_and_ap.patch | 10 +++---- package/mac80211/patches/502-ath9k_ahb_init.patch | 2 +- .../mac80211/patches/540-ath9k_extra_leds.patch | 2 +- 5 files changed, 32 insertions(+), 26 deletions(-) (limited to 'package/mac80211/patches') diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch index 9afe20e8c3..23b992d350 100644 --- a/package/mac80211/patches/300-pending_work.patch +++ b/package/mac80211/patches/300-pending_work.patch @@ -18,27 +18,30 @@ return; ewma_add(&ah->ah_beacon_rssi_avg, rssi); -@@ -2416,6 +2416,19 @@ ath5k_tx_complete_poll_work(struct work_ +@@ -2416,6 +2416,22 @@ ath5k_tx_complete_poll_work(struct work_ * Initialization routines * \*************************/ +static const struct ieee80211_iface_limit if_limits[] = { -+ { .max = 256, .types = BIT(NL80211_IFTYPE_STATION) }, -+ { .max = 4, .types = BIT(NL80211_IFTYPE_AP) | -+ BIT(NL80211_IFTYPE_MESH_POINT) }, ++ { .max = 2048, .types = BIT(NL80211_IFTYPE_STATION) }, ++ { .max = 4, .types = ++#ifdef CONFIG_MAC80211_MESH ++ BIT(NL80211_IFTYPE_MESH_POINT) | ++#endif ++ BIT(NL80211_IFTYPE_AP) }, +}; + +static const struct ieee80211_iface_combination if_comb = { + .limits = if_limits, + .n_limits = ARRAY_SIZE(if_limits), -+ .max_interfaces = 256, ++ .max_interfaces = 2048, + .num_different_channels = 1, +}; + int __devinit ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops) { -@@ -2437,6 +2450,9 @@ ath5k_init_ah(struct ath5k_hw *ah, const +@@ -2437,6 +2453,9 @@ ath5k_init_ah(struct ath5k_hw *ah, const BIT(NL80211_IFTYPE_ADHOC) | BIT(NL80211_IFTYPE_MESH_POINT); @@ -826,29 +829,32 @@ WLAN_STA_BLOCK_BA, --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c -@@ -647,6 +647,21 @@ void ath9k_reload_chainmask_settings(str +@@ -647,6 +647,24 @@ void ath9k_reload_chainmask_settings(str setup_ht_cap(sc, &sc->sbands[IEEE80211_BAND_5GHZ].ht_cap); } +static const struct ieee80211_iface_limit if_limits[] = { -+ { .max = 256, .types = BIT(NL80211_IFTYPE_STATION) | ++ { .max = 2048, .types = BIT(NL80211_IFTYPE_STATION) | + BIT(NL80211_IFTYPE_P2P_CLIENT) | + BIT(NL80211_IFTYPE_WDS) }, -+ { .max = 8, .types = BIT(NL80211_IFTYPE_AP) | -+ BIT(NL80211_IFTYPE_P2P_GO) | -+ BIT(NL80211_IFTYPE_MESH_POINT) }, ++ { .max = 8, .types = ++#ifdef CONFIG_MAC80211_MESH ++ BIT(NL80211_IFTYPE_MESH_POINT) | ++#endif ++ BIT(NL80211_IFTYPE_AP) | ++ BIT(NL80211_IFTYPE_P2P_GO) }, +}; + +static const struct ieee80211_iface_combination if_comb = { + .limits = if_limits, + .n_limits = ARRAY_SIZE(if_limits), -+ .max_interfaces = 256, ++ .max_interfaces = 2048, + .num_different_channels = 1, +}; void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) { -@@ -676,6 +691,9 @@ void ath9k_set_hw_capab(struct ath_softc +@@ -676,6 +694,9 @@ void ath9k_set_hw_capab(struct ath_softc BIT(NL80211_IFTYPE_ADHOC) | BIT(NL80211_IFTYPE_MESH_POINT); diff --git a/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch b/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch index 6e9e5ef873..d23edd3b84 100644 --- a/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch +++ b/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch @@ -34,11 +34,11 @@ if (sc->nbcnvifs >= ATH_BCBUF) { --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c -@@ -653,6 +653,7 @@ static const struct ieee80211_iface_limi - BIT(NL80211_IFTYPE_WDS) }, - { .max = 8, .types = BIT(NL80211_IFTYPE_AP) | - BIT(NL80211_IFTYPE_P2P_GO) | +@@ -655,6 +655,7 @@ static const struct ieee80211_iface_limi + #ifdef CONFIG_MAC80211_MESH + BIT(NL80211_IFTYPE_MESH_POINT) | + #endif + BIT(NL80211_IFTYPE_ADHOC) | - BIT(NL80211_IFTYPE_MESH_POINT) }, + BIT(NL80211_IFTYPE_AP) | + BIT(NL80211_IFTYPE_P2P_GO) }, }; - diff --git a/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch b/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch index 410e6bca1b..ab8d6dcfef 100644 --- a/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch +++ b/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch @@ -36,11 +36,11 @@ intval /= ATH_BCBUF; /* staggered multi-bss beacons */ if (intval < 15) ATH5K_WARN(ah, "intval %u is too low, min 15\n", -@@ -2419,6 +2419,7 @@ ath5k_tx_complete_poll_work(struct work_ - static const struct ieee80211_iface_limit if_limits[] = { - { .max = 256, .types = BIT(NL80211_IFTYPE_STATION) }, - { .max = 4, .types = BIT(NL80211_IFTYPE_AP) | +@@ -2422,6 +2422,7 @@ static const struct ieee80211_iface_limi + #ifdef CONFIG_MAC80211_MESH + BIT(NL80211_IFTYPE_MESH_POINT) | + #endif + BIT(NL80211_IFTYPE_ADHOC) | - BIT(NL80211_IFTYPE_MESH_POINT) }, + BIT(NL80211_IFTYPE_AP) }, }; diff --git a/package/mac80211/patches/502-ath9k_ahb_init.patch b/package/mac80211/patches/502-ath9k_ahb_init.patch index 4681b2936c..78bd237b52 100644 --- a/package/mac80211/patches/502-ath9k_ahb_init.patch +++ b/package/mac80211/patches/502-ath9k_ahb_init.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c -@@ -901,23 +901,23 @@ static int __init ath9k_init(void) +@@ -904,23 +904,23 @@ static int __init ath9k_init(void) goto err_out; } diff --git a/package/mac80211/patches/540-ath9k_extra_leds.patch b/package/mac80211/patches/540-ath9k_extra_leds.patch index 13b9d18840..6ba952c83f 100644 --- a/package/mac80211/patches/540-ath9k_extra_leds.patch +++ b/package/mac80211/patches/540-ath9k_extra_leds.patch @@ -171,7 +171,7 @@ --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c -@@ -778,7 +778,7 @@ int ath9k_init_device(u16 devid, struct +@@ -781,7 +781,7 @@ int ath9k_init_device(u16 devid, struct #ifdef CONFIG_MAC80211_LEDS /* must be initialized before ieee80211_register_hw */ -- cgit v1.2.3