aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/311-rt2x00-Channel-HT40-fixes-rt2800pci.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-02-26 18:03:20 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-02-26 18:03:20 +0000
commit86307b4db2cc678440b0456c09d6b0388602094a (patch)
tree8dd4ba69ea4575b742dc1963efe1cb2959eda035 /package/mac80211/patches/311-rt2x00-Channel-HT40-fixes-rt2800pci.patch
parentd33317c579add5ab873d4a801c1dcffe1c3b4fa9 (diff)
downloadupstream-86307b4db2cc678440b0456c09d6b0388602094a.tar.gz
upstream-86307b4db2cc678440b0456c09d6b0388602094a.tar.bz2
upstream-86307b4db2cc678440b0456c09d6b0388602094a.zip
mac80211: update compat-wireless to 2009-02-25
SVN-Revision: 14675
Diffstat (limited to 'package/mac80211/patches/311-rt2x00-Channel-HT40-fixes-rt2800pci.patch')
-rw-r--r--package/mac80211/patches/311-rt2x00-Channel-HT40-fixes-rt2800pci.patch23
1 files changed, 8 insertions, 15 deletions
diff --git a/package/mac80211/patches/311-rt2x00-Channel-HT40-fixes-rt2800pci.patch b/package/mac80211/patches/311-rt2x00-Channel-HT40-fixes-rt2800pci.patch
index 635cdeef1c..310e22f048 100644
--- a/package/mac80211/patches/311-rt2x00-Channel-HT40-fixes-rt2800pci.patch
+++ b/package/mac80211/patches/311-rt2x00-Channel-HT40-fixes-rt2800pci.patch
@@ -9,11 +9,9 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
drivers/net/wireless/rt2x00/rt2800pci.h | 3 +-
2 files changed, 36 insertions(+), 36 deletions(-)
-diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
-index 95eb053..ddea65b 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
-@@ -603,7 +603,7 @@ static void rt2800pci_config_ant(struct rt2x00_dev *rt2x00dev,
+@@ -603,7 +603,7 @@ static void rt2800pci_config_ant(struct
rt2x00_set_field8(&r3, BBP3_RX_ANTENNA, 0);
break;
case 2:
@@ -22,7 +20,7 @@ index 95eb053..ddea65b 100644
break;
case 3:
/* Do nothing */
-@@ -653,6 +653,7 @@ static void rt2800pci_config_lna_gain(struct rt2x00_dev *rt2x00dev,
+@@ -653,6 +653,7 @@ static void rt2800pci_config_lna_gain(st
}
static void rt2800pci_config_channel(struct rt2x00_dev *rt2x00dev,
@@ -30,7 +28,7 @@ index 95eb053..ddea65b 100644
struct rf_channel *rf,
struct channel_info *info)
{
-@@ -660,34 +661,20 @@ static void rt2800pci_config_channel(struct rt2x00_dev *rt2x00dev,
+@@ -660,34 +661,20 @@ static void rt2800pci_config_channel(str
unsigned int tx_pin;
u16 eeprom;
@@ -66,7 +64,7 @@ index 95eb053..ddea65b 100644
} else if (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RXPATH) == 2)
rt2x00_set_field32(&rf->rf2, RF2_ANTENNA_RX2, 1);
-@@ -715,19 +702,14 @@ static void rt2800pci_config_channel(struct rt2x00_dev *rt2x00dev,
+@@ -715,19 +702,14 @@ static void rt2800pci_config_channel(str
rt2x00_set_field32(&rf->rf4, RF4_TXPOWER_A,
TXPOWER_A_TO_DEV(info->tx_power2));
@@ -87,7 +85,7 @@ index 95eb053..ddea65b 100644
rt2800pci_rf_write(rt2x00dev, 1, rf->rf1);
rt2800pci_rf_write(rt2x00dev, 2, rf->rf2);
-@@ -764,11 +746,6 @@ static void rt2800pci_config_channel(struct rt2x00_dev *rt2x00dev,
+@@ -764,11 +746,6 @@ static void rt2800pci_config_channel(str
rt2800pci_bbp_write(rt2x00dev, 82, 0x84);
rt2800pci_bbp_write(rt2x00dev, 75, 0x50);
}
@@ -99,7 +97,7 @@ index 95eb053..ddea65b 100644
} else {
rt2800pci_bbp_write(rt2x00dev, 82, 0xf2);
-@@ -776,13 +753,35 @@ static void rt2800pci_config_channel(struct rt2x00_dev *rt2x00dev,
+@@ -776,13 +753,35 @@ static void rt2800pci_config_channel(str
rt2800pci_bbp_write(rt2x00dev, 75, 0x46);
else
rt2800pci_bbp_write(rt2x00dev, 75, 0x50);
@@ -139,7 +137,7 @@ index 95eb053..ddea65b 100644
rt2x00pci_register_write(rt2x00dev, TX_PIN_CFG, tx_pin);
msleep(1);
-@@ -917,8 +916,8 @@ static void rt2800pci_config(struct rt2x00_dev *rt2x00dev,
+@@ -917,8 +916,8 @@ static void rt2800pci_config(struct rt2x
rt2800pci_config_lna_gain(rt2x00dev, libconf);
if (flags & IEEE80211_CONF_CHANGE_CHANNEL)
@@ -150,7 +148,7 @@ index 95eb053..ddea65b 100644
if (flags & IEEE80211_CONF_CHANGE_POWER)
rt2800pci_config_txpower(rt2x00dev, libconf->conf->power_level);
if (flags & IEEE80211_CONF_CHANGE_RETRY_LIMITS)
-@@ -2724,14 +2723,14 @@ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = {
+@@ -2724,14 +2723,14 @@ static const struct rt2x00lib_ops rt2800
static const struct data_queue_desc rt2800pci_queue_rx = {
.entry_num = RX_ENTRIES,
@@ -167,8 +165,6 @@ index 95eb053..ddea65b 100644
.desc_size = TXD_DESC_SIZE,
.priv_size = sizeof(struct queue_entry_priv_pci),
};
-diff --git a/drivers/net/wireless/rt2x00/rt2800pci.h b/drivers/net/wireless/rt2x00/rt2800pci.h
-index 39f045c..0682a6a 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.h
+++ b/drivers/net/wireless/rt2x00/rt2800pci.h
@@ -791,6 +791,7 @@
@@ -188,6 +184,3 @@ index 39f045c..0682a6a 100644
/*
* EEPROM content.
---
-1.6.0
-