From 3aab0f429f5249111a50b1d040d5fbfd8ecd05c6 Mon Sep 17 00:00:00 2001
From: Kalle Valo <kalle.valo@nokia.com>
Date: Sun, 30 Nov 2008 20:56:28 +0200
Subject: [PATCH] --- yaml --- r: 122493 b: refs/heads/master c:
 8bef7a10014c4579c66579ab47fc1bb9563ac42a h: refs/heads/master i:   122491:
 24bcfd8728685410951e3a070fb130fccb6bce7b v: v3

---
 [refs]                       | 2 +-
 trunk/include/net/mac80211.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 41b9a8107ee7..471cf106cc3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02e37ba1298359baa123cf71ffa03d92abd259b2
+refs/heads/master: 8bef7a10014c4579c66579ab47fc1bb9563ac42a
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index 0a0c59365db6..e84c922a1b16 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/include/net/mac80211.h
@@ -323,6 +323,7 @@ struct ieee80211_tx_rate {
  * @flags: transmit info flags, defined above
  * @band: the band to transmit on (use for checking for races)
  * @antenna_sel_tx: antenna to use, 0 for automatic diversity
+ * @pad: padding, ignore
  * @control: union for control data
  * @status: union for status data
  * @driver_data: array of driver_data pointers