summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/p54/p54common.h
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@web.de>2008-11-29 22:35:43 +0100
committerJohn W. Linville <linville@tuxdriver.com>2008-12-05 15:35:44 +0100
commit64c354ddcd65c98d9a1e2a8f7fb5cc80c7fa488e (patch)
treeccec32736bbb126b0c0e7d07a66821f7d5525ffa /drivers/net/wireless/p54/p54common.h
parentp54: utilize cryptographic accelerator (diff)
downloadlinux-64c354ddcd65c98d9a1e2a8f7fb5cc80c7fa488e.tar.xz
linux-64c354ddcd65c98d9a1e2a8f7fb5cc80c7fa488e.zip
p54: include support for 2.13.24.0 USB LM87 Firmwares
Those firmwares are probably capable of reprogramming the device's eeprom. We better support them officially, before all the accidents happen. Signed-off-by: Christian Lamparter <chunkeey@web.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/p54/p54common.h')
-rw-r--r--drivers/net/wireless/p54/p54common.h18
1 files changed, 15 insertions, 3 deletions
diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireless/p54/p54common.h
index d292ffbec08c..5a68fdae7730 100644
--- a/drivers/net/wireless/p54/p54common.h
+++ b/drivers/net/wireless/p54/p54common.h
@@ -246,9 +246,21 @@ struct memrecord {
};
struct p54_eeprom_lm86 {
- __le16 offset;
- __le16 len;
- u8 data[0];
+ union {
+ struct {
+ __le16 offset;
+ __le16 len;
+ u8 data[0];
+ } v1;
+ struct {
+ __le32 offset;
+ __le16 len;
+ u8 magic2;
+ u8 pad;
+ u8 magic[4];
+ u8 data[0];
+ } v2;
+ } __attribute__ ((packed));
} __attribute__ ((packed));
enum p54_rx_decrypt_status {