diff options
| author | Simon Kelley <simon@thekelleys.org.uk> | 2003-09-25 12:57:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2003-09-25 12:57:01 -0400 |
| commit | 8e4b3625f67d85607beaddd5bf913a00a63e281b (patch) | |
| tree | 5206db5c9e53d11ad217825691021a4eef8e8cf2 | |
| parent | 83c3b403e39a71563b9f4bc9c8715b4e8691b427 (diff) | |
[PATCH] - atmel wireless driver
This does two things:
1) Fix alignment problem on PARISC64 (and maybe other 64bit archs.)
2) Add another couple of cards to the table.
Cheers,
Simon.
| -rw-r--r-- | drivers/net/wireless/atmel.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/atmel_cs.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index 2dfcc5e49308..c592df7c6a4f 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c @@ -521,7 +521,6 @@ struct atmel_private { int operating_mode, power_mode; time_t last_qual; int beacons_this_sec; - u64 last_beacon_timestamp; int channel; int reg_domain; int tx_rate; @@ -559,6 +558,7 @@ struct atmel_private { int SSID_size, new_SSID_size; u8 CurrentBSSID[6], BSSID[6]; u8 SSID[MAX_SSID_LENGTH], new_SSID[MAX_SSID_LENGTH]; + u64 last_beacon_timestamp; u8 rx_buf[MAX_WIRELESS_BODY]; }; diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c index 0d64b13dc633..2e014c19e7b8 100644 --- a/drivers/net/wireless/atmel_cs.c +++ b/drivers/net/wireless/atmel_cs.c @@ -341,7 +341,9 @@ static struct { { 0, 0, "SMC/2632W", "atmel_at76c502d.bin", "SMC 2632W-V3" }, { 0xd601, 0x0007, NULL, "atmel_at76c502.bin", "Sitecom WLAN-011"}, /* suspect - from a usenet posting. */ { 0x01bf, 0x3302, NULL, "atmel_at76c502d.bin", "Belkin F5D6060u"}, /* " " " " " */ - { 0, 0, "BT/Voyager 1020 Laptop Adapter", "atmel_at76c502.bin", "BT Voyager 1020"} + { 0, 0, "BT/Voyager 1020 Laptop Adapter", "atmel_at76c502.bin", "BT Voyager 1020"}, + { 0, 0, "IEEE 802.11b/Wireless LAN PC Card", "atmel_at76c502.bin", "Siemens Gigaset PC Card II" }, + { 0, 0, "CNet/CNWLC 11Mbps Wireless PC Card V-5", "atmel_at76c502e.bin", "CNet CNWLC-811ARL" } }; /* This is strictly temporary, until PCMCIA devices get integrated into the device model. */ |