diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 13:13:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 13:13:16 -0400 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /drivers/net/wireless/wl3501.h | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
Diffstat (limited to 'drivers/net/wireless/wl3501.h')
| -rw-r--r-- | drivers/net/wireless/wl3501.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl3501.h b/drivers/net/wireless/wl3501.h index 7fcbe589c3f2..4303c50c2ab6 100644 --- a/drivers/net/wireless/wl3501.h +++ b/drivers/net/wireless/wl3501.h | |||
| @@ -548,7 +548,7 @@ struct wl3501_80211_tx_plcp_hdr { | |||
| 548 | 548 | ||
| 549 | struct wl3501_80211_tx_hdr { | 549 | struct wl3501_80211_tx_hdr { |
| 550 | struct wl3501_80211_tx_plcp_hdr pclp_hdr; | 550 | struct wl3501_80211_tx_plcp_hdr pclp_hdr; |
| 551 | struct ieee80211_hdr mac_hdr; | 551 | struct ieee80211_hdr_4addr mac_hdr; |
| 552 | } __attribute__ ((packed)); | 552 | } __attribute__ ((packed)); |
| 553 | 553 | ||
| 554 | /* | 554 | /* |