summaryrefslogtreecommitdiff
path: root/net-wireless/compat-wireless/files/compat-chaos.patch
diff options
context:
space:
mode:
Diffstat (limited to 'net-wireless/compat-wireless/files/compat-chaos.patch')
-rw-r--r--net-wireless/compat-wireless/files/compat-chaos.patch166
1 files changed, 0 insertions, 166 deletions
diff --git a/net-wireless/compat-wireless/files/compat-chaos.patch b/net-wireless/compat-wireless/files/compat-chaos.patch
deleted file mode 100644
index e1447b5f..00000000
--- a/net-wireless/compat-wireless/files/compat-chaos.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-diff -Naur compat-wireless-2.6.32-rc1/drivers/net/wireless/ath/ath5k/base.c compat-chaos/drivers/net/wireless/ath/ath5k/base.c
---- compat-wireless-2.6.32-rc1/drivers/net/wireless/ath/ath5k/base.c 2009-10-02 16:42:13.000000000 -0700
-+++ compat-chaos/drivers/net/wireless/ath/ath5k/base.c 2009-10-05 09:45:40.000000000 -0700
-@@ -285,7 +285,7 @@
- static void ath5k_detach(struct pci_dev *pdev,
- struct ieee80211_hw *hw);
- /* Channel/mode setup */
--static inline short ath5k_ieee2mhz(short chan);
-+static inline short ath5k_ieee2mhz(int chan, unsigned int chfreq);
- static unsigned int ath5k_copy_channels(struct ath5k_hw *ah,
- struct ieee80211_channel *channels,
- unsigned int mode,
-@@ -889,7 +889,7 @@
- * Convert IEEE channel number to MHz frequency.
- */
- static inline short
--ath5k_ieee2mhz(short chan)
-+ath5k_ieee2mhz(int chan, unsigned int chfreq)
- {
- if (chan <= 14 || chan >= 27)
- return ieee80211chan2mhz(chan);
-@@ -902,13 +902,7 @@
- */
- static bool ath5k_is_standard_channel(short chan)
- {
-- return ((chan <= 14) ||
-- /* UNII 1,2 */
-- ((chan & 3) == 0 && chan >= 36 && chan <= 64) ||
-- /* midband */
-- ((chan & 3) == 0 && chan >= 100 && chan <= 140) ||
-- /* UNII-3 */
-- ((chan & 3) == 1 && chan >= 149 && chan <= 165));
-+ return true;
- }
-
- static unsigned int
-@@ -917,7 +911,8 @@
- unsigned int mode,
- unsigned int max)
- {
-- unsigned int i, count, size, chfreq, freq, ch;
-+ unsigned int i, count, size, chfreq, freq;
-+ int ch;
-
- if (!test_bit(mode, ah->ah_modes))
- return 0;
-@@ -926,13 +921,15 @@
- case AR5K_MODE_11A:
- case AR5K_MODE_11A_TURBO:
- /* 1..220, but 2GHz frequencies are filtered by check_channel */
-- size = 220 ;
-+ size = 3000 ;
-+ ch = -40;
- chfreq = CHANNEL_5GHZ;
- break;
- case AR5K_MODE_11B:
- case AR5K_MODE_11G:
- case AR5K_MODE_11G_TURBO:
-- size = 26;
-+ size = 3000;
-+ ch = -43;
- chfreq = CHANNEL_2GHZ;
- break;
- default:
-@@ -940,9 +937,8 @@
- return 0;
- }
-
-- for (i = 0, count = 0; i < size && max > 0; i++) {
-- ch = i + 1 ;
-- freq = ath5k_ieee2mhz(ch);
-+ for (i = 0, count = 0; i < size && max > 0; i++,ch++) {
-+ freq = ath5k_ieee2mhz(ch,chfreq);
-
- /* Check if channel is supported by the chipset */
- if (!ath5k_channel_ok(ah, freq, chfreq))
-@@ -1246,7 +1242,9 @@
-
- rate = ieee80211_get_tx_rate(sc->hw, info);
-
-- if (info->flags & IEEE80211_TX_CTL_NO_ACK)
-+ if (info->flags & IEEE80211_TX_CTL_NO_ACK ||
-+ (info->flags & IEEE80211_TX_CTL_INJECTED &&
-+ !(ieee80211_has_morefrags(((struct ieee80211_hdr *)skb->data)->frame_control))))
- flags |= AR5K_TXDESC_NOACK;
-
- rc_flags = info->control.rates[0].flags;
-diff -Naur compat-wireless-2.6.32-rc1/drivers/net/wireless/ath/ath5k/base.h compat-chaos/drivers/net/wireless/ath/ath5k/base.h
---- compat-wireless-2.6.32-rc1/drivers/net/wireless/ath/ath5k/base.h 2009-10-02 16:42:15.000000000 -0700
-+++ compat-chaos/drivers/net/wireless/ath/ath5k/base.h 2009-10-05 09:46:12.000000000 -0700
-@@ -110,9 +110,9 @@
- };
-
- #if CHAN_DEBUG
--#define ATH_CHAN_MAX (26+26+26+200+200)
-+#define ATH_CHAN_MAX (4000)
- #else
--#define ATH_CHAN_MAX (14+14+14+252+20)
-+#define ATH_CHAN_MAX (4000)
- #endif
-
- /* Software Carrier, keeps track of the driver state
-diff -Naur compat-wireless-2.6.32-rc1/drivers/net/wireless/ath/ath5k/caps.c compat-chaos/drivers/net/wireless/ath/ath5k/caps.c
---- compat-wireless-2.6.32-rc1/drivers/net/wireless/ath/ath5k/caps.c 2009-10-02 16:42:13.000000000 -0700
-+++ compat-chaos/drivers/net/wireless/ath/ath5k/caps.c 2009-10-05 09:47:07.000000000 -0700
-@@ -69,8 +69,8 @@
-
- if (AR5K_EEPROM_HDR_11A(ee_header)) {
- /* 4920 */
-- ah->ah_capabilities.cap_range.range_5ghz_min = 5005;
-- ah->ah_capabilities.cap_range.range_5ghz_max = 6100;
-+ ah->ah_capabilities.cap_range.range_5ghz_min = 4800;
-+ ah->ah_capabilities.cap_range.range_5ghz_max = 6000;
-
- /* Set supported modes */
- __set_bit(AR5K_MODE_11A,
-@@ -88,7 +88,7 @@
- (AR5K_EEPROM_HDR_11G(ee_header) &&
- ah->ah_version != AR5K_AR5211)) {
- /* 2312 */
-- ah->ah_capabilities.cap_range.range_2ghz_min = 2412;
-+ ah->ah_capabilities.cap_range.range_2ghz_min = 2192;
- ah->ah_capabilities.cap_range.range_2ghz_max = 2732;
-
- if (AR5K_EEPROM_HDR_11B(ee_header))
-diff -Naur compat-wireless-2.6.32-rc1/drivers/net/wireless/ath/ath5k/phy.c compat-chaos/drivers/net/wireless/ath/ath5k/phy.c
---- compat-wireless-2.6.32-rc1/drivers/net/wireless/ath/ath5k/phy.c 2009-10-02 16:42:13.000000000 -0700
-+++ compat-chaos/drivers/net/wireless/ath/ath5k/phy.c 2009-10-05 09:48:55.000000000 -0700
-@@ -830,13 +830,7 @@
- bool ath5k_channel_ok(struct ath5k_hw *ah, u16 freq, unsigned int flags)
- {
- /* Check if the channel is in our supported range */
-- if (flags & CHANNEL_2GHZ) {
-- if ((freq >= ah->ah_capabilities.cap_range.range_2ghz_min) &&
-- (freq <= ah->ah_capabilities.cap_range.range_2ghz_max))
-- return true;
-- } else if (flags & CHANNEL_5GHZ)
-- if ((freq >= ah->ah_capabilities.cap_range.range_5ghz_min) &&
-- (freq <= ah->ah_capabilities.cap_range.range_5ghz_max))
-+ if ((freq >=2190) && (freq <=5900))
- return true;
-
- return false;
-diff -Naur compat-wireless-2.6.32-rc1/include/net/ieee80211_radiotap.h compat-chaos/include/net/ieee80211_radiotap.h
---- compat-wireless-2.6.32-rc1/include/net/ieee80211_radiotap.h 2009-10-02 16:42:12.000000000 -0700
-+++ compat-chaos/include/net/ieee80211_radiotap.h 2009-10-05 09:49:54.000000000 -0700
-@@ -247,7 +247,7 @@
- #define ieee80211chan2mhz(x) \
- (((x) <= 14) ? \
- (((x) == 14) ? 2484 : ((x) * 5) + 2407) : \
-- ((x) + 1000) * 5)
-+ ((x) + 2100))
-
- /* helpers */
- static inline int ieee80211_get_radiotap_len(unsigned char *data)
-diff -Naur compat-wireless-2.6.32-rc1/net/mac80211/tx.c compat-chaos/net/mac80211/tx.c
---- compat-wireless-2.6.32-rc1/net/mac80211/tx.c 2009-10-02 16:42:12.000000000 -0700
-+++ compat-chaos/net/mac80211/tx.c 2009-10-05 09:50:38.000000000 -0700
-@@ -1392,6 +1392,7 @@
- {
- struct ieee80211_local *local = sdata->local;
- struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-+ struct ieee80211_channel *chan = local->hw.conf.channel;
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
- struct ieee80211_sub_if_data *tmp_sdata;
- int headroom;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 13:01:16 +0000