Ignore:
Timestamp:
2011-08-29T10:00:00+02:00 (5 years ago)
Author:
nbd
Message:

ath9k: minor fixes for the antenna control patch

File:
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/patches/582-ath9k_antenna_control.patch

    r28108 r28109  
    2525        hw->flags = IEEE80211_HW_RX_INCLUDES_FCS | 
    2626                IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING | 
    27 @@ -692,6 +705,17 @@ void ath9k_set_hw_capab(struct ath_softc 
     27@@ -692,6 +705,16 @@ void ath9k_set_hw_capab(struct ath_softc 
    2828        hw->sta_data_size = sizeof(struct ath_node); 
    2929        hw->vif_data_size = sizeof(struct ath_vif); 
     
    3333+ 
    3434+       /* single chain devices with rx diversity */ 
    35 +       if (ah->caps.max_rxchains == 1 && 
    36 +           ath9k_hw_ops(ah)->antdiv_comb_conf_get) 
    37 +               hw->wiphy->available_antennas_rx = 3; 
     35+       if (ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) 
     36+               hw->wiphy->available_antennas_rx = BIT(0) | BIT(1); 
    3837+ 
    3938+       sc->ant_rx = hw->wiphy->available_antennas_rx; 
     
    4342        hw->rate_control_algorithm = "ath9k_rate_control"; 
    4443 #endif 
    45 @@ -703,12 +727,7 @@ void ath9k_set_hw_capab(struct ath_softc 
     44@@ -703,12 +726,7 @@ void ath9k_set_hw_capab(struct ath_softc 
    4645                hw->wiphy->bands[IEEE80211_BAND_5GHZ] = 
    4746                        &sc->sbands[IEEE80211_BAND_5GHZ]; 
     
    6362  
    6463        struct ath_ant_comb ant_comb; 
    65 +       u32 ant_tx, ant_rx; 
     64+       u8 ant_tx, ant_rx; 
    6665 }; 
    6766  
Note: See TracChangeset for help on using the changeset viewer.