diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 12:05:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 12:05:25 -0400 |
| commit | e5dfa9282f3db461a896a6692b529e1823ba98c6 (patch) | |
| tree | 574d23cebc57c657373b0e1b6692c047aba8dd6e /drivers/net/wireless/ipw2100.h | |
| parent | 5dd962494f76fb3ef1196cd420b5d6260d7a3766 (diff) | |
| parent | b2ab040db85835e54c7559533df7f85902617926 (diff) | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/wireless/ipw2100.h')
| -rw-r--r-- | drivers/net/wireless/ipw2100.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2100.h b/drivers/net/wireless/ipw2100.h index 2a3cdbd50168..c9e99ce15d66 100644 --- a/drivers/net/wireless/ipw2100.h +++ b/drivers/net/wireless/ipw2100.h | |||
| @@ -808,7 +808,7 @@ struct ipw2100_priv { | |||
| 808 | struct ipw2100_rx { | 808 | struct ipw2100_rx { |
| 809 | union { | 809 | union { |
| 810 | unsigned char payload[IPW_RX_NIC_BUFFER_LENGTH]; | 810 | unsigned char payload[IPW_RX_NIC_BUFFER_LENGTH]; |
| 811 | struct ieee80211_hdr header; | 811 | struct ieee80211_hdr_4addr header; |
| 812 | u32 status; | 812 | u32 status; |
| 813 | struct ipw2100_notification notification; | 813 | struct ipw2100_notification notification; |
| 814 | struct ipw2100_cmd_header command; | 814 | struct ipw2100_cmd_header command; |