diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/wireless/wl12xx/wl12xx_80211.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl12xx_80211.h')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl12xx_80211.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl12xx_80211.h b/drivers/net/wireless/wl12xx/wl12xx_80211.h index 657c2dbcb7d3..055d7bc6f592 100644 --- a/drivers/net/wireless/wl12xx/wl12xx_80211.h +++ b/drivers/net/wireless/wl12xx/wl12xx_80211.h | |||
| @@ -122,8 +122,8 @@ struct wl12xx_null_data_template { | |||
| 122 | } __attribute__ ((packed)); | 122 | } __attribute__ ((packed)); |
| 123 | 123 | ||
| 124 | struct wl12xx_ps_poll_template { | 124 | struct wl12xx_ps_poll_template { |
| 125 | u16 fc; | 125 | __le16 fc; |
| 126 | u16 aid; | 126 | __le16 aid; |
| 127 | u8 bssid[ETH_ALEN]; | 127 | u8 bssid[ETH_ALEN]; |
| 128 | u8 ta[ETH_ALEN]; | 128 | u8 ta[ETH_ALEN]; |
| 129 | } __attribute__ ((packed)); | 129 | } __attribute__ ((packed)); |