Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits) tree-wide: fix misspelling of "definition" in comments reiserfs: fix misspelling of "journaled" doc: Fix a typo in slub.txt. inotify: remove superfluous return code check hdlc: spelling fix in find_pvc() comment doc: fix regulator docs cut-and-pasteism mtd: Fix comment in Kconfig doc: Fix IRQ chip docs tree-wide: fix assorted typos all over the place drivers/ata/libata-sff.c: comment spelling fixes fix typos/grammos in Documentation/edac.txt sysctl: add missing comments fs/debugfs/inode.c: fix comment typos sgivwfb: Make use of ARRAY_SIZE. sky2: fix sky2_link_down copy/paste comment error tree-wide: fix typos "couter" -> "counter" tree-wide: fix typos "offest" -> "offset" fix kerneldoc for set_irq_msi() spidev: fix double "of of" in comment comment typo fix: sybsystem -> subsystem ...
This commit is contained in:
@@ -36,7 +36,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* Defintions for the Atheros Wireless LAN controller driver.
|
||||
* Definitions for the Atheros Wireless LAN controller driver.
|
||||
*/
|
||||
#ifndef _DEV_ATH_ATHVAR_H
|
||||
#define _DEV_ATH_ATHVAR_H
|
||||
@@ -190,7 +190,7 @@ struct ath5k_softc {
|
||||
struct ath5k_txq *cabq; /* content after beacon */
|
||||
|
||||
int power_level; /* Requested tx power in dbm */
|
||||
bool assoc; /* assocate state */
|
||||
bool assoc; /* associate state */
|
||||
bool enable_beacon; /* true if beacons are on */
|
||||
};
|
||||
|
||||
|
@@ -1492,7 +1492,7 @@ ath5k_eeprom_read_target_rate_pwr_info(struct ath5k_hw *ah, unsigned int mode)
|
||||
* This info is used to calibrate the baseband power table. Imagine
|
||||
* that for each channel there is a power curve that's hw specific
|
||||
* (depends on amplifier etc) and we try to "correct" this curve using
|
||||
* offests we pass on to phy chip (baseband -> before amplifier) so that
|
||||
* offsets we pass on to phy chip (baseband -> before amplifier) so that
|
||||
* it can use accurate power values when setting tx power (takes amplifier's
|
||||
* performance on each channel into account).
|
||||
*
|
||||
|
@@ -117,7 +117,7 @@ static unsigned int ath5k_hw_rfb_op(struct ath5k_hw *ah,
|
||||
|
||||
/*
|
||||
* This code is used to optimize rf gain on different environments
|
||||
* (temprature mostly) based on feedback from a power detector.
|
||||
* (temperature mostly) based on feedback from a power detector.
|
||||
*
|
||||
* It's only used on RF5111 and RF5112, later RF chips seem to have
|
||||
* auto adjustment on hw -notice they have a much smaller BANK 7 and
|
||||
@@ -2746,7 +2746,7 @@ ath5k_setup_channel_powertable(struct ath5k_hw *ah,
|
||||
/* Fill curves in reverse order
|
||||
* from lower power (max gain)
|
||||
* to higher power. Use curve -> idx
|
||||
* backmaping we did on eeprom init */
|
||||
* backmapping we did on eeprom init */
|
||||
u8 idx = pdg_curve_to_idx[pdg];
|
||||
|
||||
/* Grab the needed curves by index */
|
||||
@@ -2848,7 +2848,7 @@ ath5k_setup_channel_powertable(struct ath5k_hw *ah,
|
||||
/* Now we have a set of curves for this
|
||||
* channel on tmpL (x range is table_max - table_min
|
||||
* and y values are tmpL[pdg][]) sorted in the same
|
||||
* order as EEPROM (because we've used the backmaping).
|
||||
* order as EEPROM (because we've used the backmapping).
|
||||
* So for RF5112 it's from higher power to lower power
|
||||
* and for RF2413 it's from lower power to higher power.
|
||||
* For RF5111 we only have one curve. */
|
||||
|
@@ -880,7 +880,7 @@ static bool ath_rc_update_per(struct ath_softc *sc,
|
||||
* Since this probe succeeded, we allow the next
|
||||
* probe twice as soon. This allows the maxRate
|
||||
* to move up faster if the probes are
|
||||
* succesful.
|
||||
* successful.
|
||||
*/
|
||||
ath_rc_priv->probe_time =
|
||||
now_msec - rate_table->probe_interval / 2;
|
||||
|
Reference in New Issue
Block a user