AA: mac80211: sync with trunk r41113
[12.09/openwrt.git] / package / mac80211 / patches / a00-ath9k_platform_h_backup.patch
1 --- a/drivers/net/wireless/ath/ath9k/init.c
2 +++ b/drivers/net/wireless/ath/ath9k/init.c
3 @@ -474,8 +474,7 @@ static int ath9k_init_soc_platform(struc
4                         return ret;
5         }
6  
7 -       if (pdata->tx_gain_buffalo)
8 -               ah->config.tx_gain_buffalo = true;
9 +       ah->config.tx_gain_buffalo = true;
10  
11         return ret;
12  }
13 @@ -508,7 +507,7 @@ static int ath9k_init_softc(u16 devid, s
14         sc->tx99_power = MAX_RATE_POWER + 1;
15         init_waitqueue_head(&sc->tx_wait);
16  
17 -       if (!pdata || pdata->use_eeprom) {
18 +       if (!pdata) {
19                 ah->ah_flags |= AH_USE_EEPROM;
20                 sc->sc_ah->led_pin = -1;
21         } else {
22 --- a/include/linux/ath9k_platform.h
23 +++ b/include/linux/ath9k_platform.h
24 @@ -33,15 +33,12 @@ struct ath9k_platform_data {
25  
26         bool endian_check;
27         bool is_clk_25mhz;
28 -       bool tx_gain_buffalo;
29         bool disable_2ghz;
30         bool disable_5ghz;
31  
32         int (*get_mac_revision)(void);
33         int (*external_reset)(void);
34  
35 -       bool use_eeprom;
36 -
37         int num_leds;
38         const struct gpio_led *leds;
39  };
40 --- a/drivers/net/wireless/ath/ath9k/pci.c
41 +++ b/drivers/net/wireless/ath/ath9k/pci.c
42 @@ -687,7 +687,7 @@ static bool ath_pci_eeprom_read(struct a
43         struct ath_softc *sc = (struct ath_softc *) common->priv;
44         struct ath9k_platform_data *pdata = sc->dev->platform_data;
45  
46 -       if (pdata && !pdata->use_eeprom) {
47 +       if (pdata) {
48                 if (off >= (ARRAY_SIZE(pdata->eeprom_data))) {
49                         ath_err(common,
50                                 "%s: eeprom read failed, offset %08x is out of range\n",