git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libertas: fix buffer overrun
[safe/jmp/linux-2.6]
/
drivers
/
net
/
wireless
/
libertas
/
hostcmd.h
diff --git
a/drivers/net/wireless/libertas/hostcmd.h
b/drivers/net/wireless/libertas/hostcmd.h
index
d27c276
..
d9f9a12
100644
(file)
--- a/
drivers/net/wireless/libertas/hostcmd.h
+++ b/
drivers/net/wireless/libertas/hostcmd.h
@@
-151,10
+151,6
@@
struct cmd_ds_get_hw_spec {
__le32 fwcapinfo;
} __attribute__ ((packed));
__le32 fwcapinfo;
} __attribute__ ((packed));
-struct cmd_ds_802_11_reset {
- __le16 action;
-};
-
struct cmd_ds_802_11_subscribe_event {
struct cmd_header hdr;
struct cmd_ds_802_11_subscribe_event {
struct cmd_header hdr;
@@
-301,7
+297,9
@@
struct cmd_ds_802_11_get_stat {
};
struct cmd_ds_802_11_snmp_mib {
};
struct cmd_ds_802_11_snmp_mib {
- __le16 querytype;
+ struct cmd_header hdr;
+
+ __le16 action;
__le16 oid;
__le16 bufsize;
u8 value[128];
__le16 oid;
__le16 bufsize;
u8 value[128];
@@
-607,14
+605,28
@@
struct cmd_ds_802_11_eeprom_access {
} __attribute__ ((packed));
struct cmd_ds_802_11_tpc_cfg {
} __attribute__ ((packed));
struct cmd_ds_802_11_tpc_cfg {
+ struct cmd_header hdr;
+
__le16 action;
__le16 action;
- u
8
enable;
-
s8
P0;
-
s8
P1;
-
s8
P2;
- u
8
usesnr;
+ u
int8_t
enable;
+
int8_t
P0;
+
int8_t
P1;
+
int8_t
P2;
+ u
int8_t
usesnr;
} __attribute__ ((packed));
} __attribute__ ((packed));
+
+struct cmd_ds_802_11_pa_cfg {
+ struct cmd_header hdr;
+
+ __le16 action;
+ uint8_t enable;
+ int8_t P0;
+ int8_t P1;
+ int8_t P2;
+} __attribute__ ((packed));
+
+
struct cmd_ds_802_11_led_ctrl {
__le16 action;
__le16 numled;
struct cmd_ds_802_11_led_ctrl {
__le16 action;
__le16 numled;
@@
-703,11
+715,9
@@
struct cmd_ds_command {
union {
struct cmd_ds_802_11_ps_mode psmode;
struct cmd_ds_802_11_associate associate;
union {
struct cmd_ds_802_11_ps_mode psmode;
struct cmd_ds_802_11_associate associate;
- struct cmd_ds_802_11_reset reset;
struct cmd_ds_802_11_authenticate auth;
struct cmd_ds_802_11_get_stat gstat;
struct cmd_ds_802_3_get_stat gstat_8023;
struct cmd_ds_802_11_authenticate auth;
struct cmd_ds_802_11_get_stat gstat;
struct cmd_ds_802_3_get_stat gstat_8023;
- struct cmd_ds_802_11_snmp_mib smib;
struct cmd_ds_802_11_rf_antenna rant;
struct cmd_ds_802_11_monitor_mode monitor;
struct cmd_ds_802_11_rssi rssi;
struct cmd_ds_802_11_rf_antenna rant;
struct cmd_ds_802_11_monitor_mode monitor;
struct cmd_ds_802_11_rssi rssi;