← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/net/wireless/ath/ath5k/reset.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/wireless/ath/ath5k/reset.c
159
159
        rxlat = AR5K_REG_MS(usec_reg, AR5K_USEC_RX_LATENCY_5211);
160
160
 
161
161
        /*
 
162
         * Set default Tx frame to Tx data start delay
 
163
         */
 
164
        txf2txs = AR5K_INIT_TXF2TXD_START_DEFAULT;
 
165
 
 
166
        /*
162
167
         * 5210 initvals don't include usec settings
163
168
         * so we need to use magic values here for
164
169
         * tx/rx latencies
1119
1124
                        /* Non fatal, can happen eg.
1120
1125
                         * on mode change */
1121
1126
                        ret = 0;
1122
 
                } else
 
1127
                } else {
 
1128
                        ATH5K_DBG(ah->ah_sc, ATH5K_DEBUG_RESET,
 
1129
                                "fast chan change successful\n");
1123
1130
                        return 0;
 
1131
                }
1124
1132
        }
1125
1133
 
1126
1134
        /*