From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 12 Nov 2008 15:01:41 +0000 (-0500)
Subject: mac80211: add explicit padding in struct ieee80211_tx_info
X-Git-Tag: v2.6.29-rc1~581^2~580^2~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=627271018df75c8861b9e75b39d5995842e6ec95;p=linux-2.6-omap-h63xx.git

mac80211: add explicit padding in struct ieee80211_tx_info

Otherwise, the BUILD_BUG_ON calls in ieee80211_tx_info_clear_status can
fail on some architectures.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 0dbbfc7b050..6a1d4ea1818 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -341,6 +341,7 @@ struct ieee80211_tx_info {
 	u8 antenna_sel_tx;
 
 	/* 2 byte hole */
+	u8 pad[2];
 
 	union {
 		struct {