diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/ieee80211.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/ieee80211.h')
| -rw-r--r-- | include/linux/ieee80211.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 529f301d9372..0b5e03eae6d2 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h | |||
| @@ -113,7 +113,7 @@ struct ieee80211_hdr { | |||
| 113 | struct ieee80211s_hdr { | 113 | struct ieee80211s_hdr { |
| 114 | u8 flags; | 114 | u8 flags; |
| 115 | u8 ttl; | 115 | u8 ttl; |
| 116 | u8 seqnum[3]; | 116 | __le32 seqnum; |
| 117 | u8 eaddr1[6]; | 117 | u8 eaddr1[6]; |
| 118 | u8 eaddr2[6]; | 118 | u8 eaddr2[6]; |
| 119 | u8 eaddr3[6]; | 119 | u8 eaddr3[6]; |