diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-commands.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-commands.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h index fb6f5ffb9f1d..9b64a390564c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-commands.h +++ b/drivers/net/wireless/iwlwifi/iwl-commands.h | |||
@@ -1481,21 +1481,10 @@ struct iwl4965_tx_resp { | |||
1481 | * table entry used for all frames in the new agg. | 1481 | * table entry used for all frames in the new agg. |
1482 | * 31-16: Sequence # for this frame's Tx cmd (not SSN!) | 1482 | * 31-16: Sequence # for this frame's Tx cmd (not SSN!) |
1483 | */ | 1483 | */ |
1484 | __le32 status; /* TX status (for aggregation status of 1st frame) */ | 1484 | union { |
1485 | } __attribute__ ((packed)); | 1485 | __le32 status; |
1486 | 1486 | struct agg_tx_status agg_status[0]; /* for each agg frame */ | |
1487 | struct iwl4965_tx_resp_agg { | 1487 | } u; |
1488 | u8 frame_count; /* 1 no aggregation, >1 aggregation */ | ||
1489 | u8 reserved1; | ||
1490 | u8 failure_rts; | ||
1491 | u8 failure_frame; | ||
1492 | __le32 rate_n_flags; | ||
1493 | __le16 wireless_media_time; | ||
1494 | __le16 reserved3; | ||
1495 | __le32 pa_power1; | ||
1496 | __le32 pa_power2; | ||
1497 | struct agg_tx_status status; /* TX status (for aggregation status */ | ||
1498 | /* of 1st frame) */ | ||
1499 | } __attribute__ ((packed)); | 1488 | } __attribute__ ((packed)); |
1500 | 1489 | ||
1501 | struct iwl5000_tx_resp { | 1490 | struct iwl5000_tx_resp { |