diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-05 22:23:34 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-05 22:23:34 -0800 |
| commit | 098401a600b6344771900fe164c5eafb668ce99c (patch) | |
| tree | c03077ee357cf6191bcd9f44ead4e6e4ce8f0495 /drivers/net/wireless/rt2x00/rt2x00.h | |
| parent | cb7b48f671f9c7582993a6c0ff6e989078048561 (diff) | |
| parent | c112d0c5b89037dd618083b5fdf4bb36b0c51d77 (diff) | |
| download | talos-op-linux-098401a600b6344771900fe164c5eafb668ce99c.tar.gz talos-op-linux-098401a600b6344771900fe164c5eafb668ce99c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00.h')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index 780ba7365810..39ecf3b82ca1 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h @@ -44,7 +44,7 @@ /* * Module information. */ -#define DRV_VERSION "2.2.2" +#define DRV_VERSION "2.2.3" #define DRV_PROJECT "http://rt2x00.serialmonkey.com" /* @@ -653,6 +653,7 @@ enum rt2x00_flags { CONFIG_EXTERNAL_LNA_BG, CONFIG_DOUBLE_ANTENNA, CONFIG_DISABLE_LINK_TUNING, + CONFIG_CRYPTO_COPY_IV, }; /* @@ -803,6 +804,12 @@ struct rt2x00_dev { u16 tx_power; /* + * Current retry values. + */ + u8 short_retry; + u8 long_retry; + + /* * Rssi <-> Dbm offset */ u8 rssi_offset; |
