diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-07-27 11:59:19 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-27 11:59:19 -0400 |
| commit | 800f65bba8d2030b3fef62850e203f9f176625a8 (patch) | |
| tree | 6507c4fe7a0826c253b4afb29375ab306a0fd9c8 /net/mac80211/ieee80211_i.h | |
| parent | 06b3cda0c12986f5bba578b918b188d731c4e191 (diff) | |
| parent | b3190df628617c7a4f188a9465aeabe1f5761933 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-commands.h
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index c6b5c2d3ffde..ef470064b154 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
| @@ -1090,7 +1090,7 @@ struct ieee80211_tx_status_rtap_hdr { | |||
| 1090 | u8 padding_for_rate; | 1090 | u8 padding_for_rate; |
| 1091 | __le16 tx_flags; | 1091 | __le16 tx_flags; |
| 1092 | u8 data_retries; | 1092 | u8 data_retries; |
| 1093 | } __attribute__ ((packed)); | 1093 | } __packed; |
| 1094 | 1094 | ||
| 1095 | 1095 | ||
| 1096 | /* HT */ | 1096 | /* HT */ |