hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ath9k/ath5k: fix driver load issues with mesh support compiled out

Browse Source 
SVN-Revision: 31326
master
Felix Fietkau 13 years ago
parent b138bca290
commit d7fee0b596
5 changed files with 32 additions and 26 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 32
      package/mac80211/patches/300-pending_work.patch
  2. 12
      package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
  3. 10
      package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
  4. 2
      package/mac80211/patches/502-ath9k_ahb_init.patch
  5. 2
      package/mac80211/patches/540-ath9k_extra_leds.patch

32
package/mac80211/patches/300-pending_work.patch
Unescape View File

@ -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);

12
package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
Unescape View File

@ -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) },
};

10
package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
Unescape View File

@ -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) },
};

2
package/mac80211/patches/502-ath9k_ahb_init.patch
Unescape View File

@ -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;
}

2
package/mac80211/patches/540-ath9k_extra_leds.patch
Unescape View File

@ -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 */

Write Preview
Loading…
Cancel
Save