diff options
| author |   Holger Schurig <hs4233@mail.mn-solutions.de> | 2007-05-25 00:14:38 -0400 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2007-06-11 14:28:37 -0400 |
| commit | bf68dac89b6502f8577a8be1b4fc06cb641ae1f3 (patch) | |
| tree | b783740bc492b0fbb6d339d9d9236b29c7388834 /drivers | |
| parent | [PATCH] libertas: move vendor & product id's into if_usb.c (diff) | |
| download | linux-dev-bf68dac89b6502f8577a8be1b4fc06cb641ae1f3.tar.xz linux-dev-bf68dac89b6502f8577a8be1b4fc06cb641ae1f3.zip | |
[PATCH] libertas: make libertas_wlan_data_rates static
Move libertas_wlan_data_rates into wext.c and make it static. wext.c is the
only user of this array.
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/libertas/defs.h | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/libertas/main.c | 8 | ||||
| -rw-r--r-- | drivers/net/wireless/libertas/wext.c | 8 |
3 files changed, 8 insertions, 10 deletions
diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/libertas/defs.h index 51050cf736b7..cd95977cf89a 100644 --- a/drivers/net/wireless/libertas/defs.h +++ b/drivers/net/wireless/libertas/defs.h @@ -205,8 +205,6 @@ typedef struct _wlan_adapter wlan_adapter; extern const char libertas_driver_version[]; extern u16 libertas_region_code_to_index[MRVDRV_MAX_REGION_CODE]; -extern u8 libertas_wlan_data_rates[WLAN_SUPPORTED_RATES]; - extern u8 libertas_supported_rates[G_SUPPORTED_RATES]; extern u8 libertas_adhoc_rates_g[G_SUPPORTED_RATES]; diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index c407f2340133..6bf162a107b0 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c @@ -142,14 +142,6 @@ static struct region_cfp_table region_cfp_table[] = { }; /** - * the rates supported by the card - */ -u8 libertas_wlan_data_rates[WLAN_SUPPORTED_RATES] = - { 0x02, 0x04, 0x0B, 0x16, 0x00, 0x0C, 0x12, - 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x00 -}; - -/** * the rates supported */ u8 libertas_supported_rates[G_SUPPORTED_RATES] = diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c index 69f52b6e59c8..408bc0aa9567 100644 --- a/drivers/net/wireless/libertas/wext.c +++ b/drivers/net/wireless/libertas/wext.c @@ -22,6 +22,14 @@ /** + * the rates supported by the card + */ +static u8 libertas_wlan_data_rates[WLAN_SUPPORTED_RATES] = + { 0x02, 0x04, 0x0B, 0x16, 0x00, 0x0C, 0x12, + 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x00 +}; + +/** * @brief Convert mw value to dbm value * * @param mw the value of mw |