Ignore:
Timestamp:
2010-07-01T22:51:30+02:00 (6 years ago)
Author:
nbd
Message:

ath9k: add a missing null pointer check and some further cleanup

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/patches/530-ath9k_nf_sanitize.patch

    r22035 r22036  
    2626--- a/drivers/net/wireless/ath/ath9k/ar9002_phy.c 
    2727+++ b/drivers/net/wireless/ath/ath9k/ar9002_phy.c 
    28 @@ -520,6 +520,30 @@ static void ar9002_hw_do_getnf(struct at 
     28@@ -481,9 +481,6 @@ static void ar9002_hw_do_getnf(struct at 
     29        ath_print(common, ATH_DBG_CALIBRATE, 
     30                  "NF calibrated [ctl] [chain 0] is %d\n", nf); 
     31  
     32-       if (AR_SREV_9271(ah) && (nf >= -114)) 
     33-               nf = -116; 
     34- 
     35        nfarray[0] = nf; 
     36  
     37        if (!AR_SREV_9285(ah) && !AR_SREV_9271(ah)) { 
     38@@ -503,9 +500,6 @@ static void ar9002_hw_do_getnf(struct at 
     39        ath_print(common, ATH_DBG_CALIBRATE, 
     40                  "NF calibrated [ext] [chain 0] is %d\n", nf); 
     41  
     42-       if (AR_SREV_9271(ah) && (nf >= -114)) 
     43-               nf = -116; 
     44- 
     45        nfarray[3] = nf; 
     46  
     47        if (!AR_SREV_9285(ah) && !AR_SREV_9271(ah)) { 
     48@@ -520,6 +514,30 @@ static void ar9002_hw_do_getnf(struct at 
    2949        } 
    3050 } 
     
    5777 { 
    5878        struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah); 
    59 @@ -532,4 +556,6 @@ void ar9002_hw_attach_phy_ops(struct ath 
     79@@ -532,4 +550,6 @@ void ar9002_hw_attach_phy_ops(struct ath 
    6080        priv_ops->olc_init = ar9002_olc_init; 
    6181        priv_ops->compute_pll_control = ar9002_hw_compute_pll_control; 
     
    303323-       else if (AR_SREV_9287(ah)) 
    304324-               noise_floor = AR_PHY_CCA_MAX_AR9287_GOOD_VALUE; 
    305 +       if (IS_CHAN_2GHZ(ah->curchan)) 
     325+       if (!ah->curchan || IS_CHAN_2GHZ(ah->curchan)) 
    306326+               limit = &ah->nf_2g; 
    307327        else 
Note: See TracChangeset for help on using the changeset viewer.