---

yaml --- r: 291142 b: refs/heads/master c: 4d196e4 h: refs/heads/master v: v3
git-mirror · Mar 5, 2012 · aa1ebd0 · aa1ebd0
1 parent c63e6a2
commit aa1ebd0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 380aeef8941c6b8a3e8de86b5ca000ca986e3b17
+refs/heads/master: 4d196e4b2ffd734393b54f351507462f19d737b5
diff --git a/trunk/net/mac80211/ieee80211_i.h b/trunk/net/mac80211/ieee80211_i.h
@@ -480,7 +480,7 @@ struct ieee80211_if_ibss {
 
 	bool control_port;
 
-	u8 bssid[ETH_ALEN];
+	u8 bssid[ETH_ALEN] __aligned(2);
 	u8 ssid[IEEE80211_MAX_SSID_LEN];
 	u8 ssid_len, ie_len;
 	u8 *ie;