From 31d719d8096c447c16ac76a929c9561e5aa4b9d4 Mon Sep 17 00:00:00 2001
From: Alexander Simon <an.alexsimon@googlemail.com>
Date: Sun, 18 Sep 2011 00:16:45 +0200
Subject: [PATCH] --- yaml --- r: 266297 b: refs/heads/master c:
 a7ce1c9446a7f7513211e4698d07357d20452909 h: refs/heads/master i:   266295:
 b2a4df640ac56b9a42535dad13c368fdc1eb26b0 v: v3

---
 [refs]                       | 2 +-
 trunk/include/net/mac80211.h | 2 +-
 trunk/net/mac80211/ibss.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7d05ce969651..0286cb4f0200 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e30815016bbd0b5c3dcdc29f53e054b57938f1aa
+refs/heads/master: a7ce1c9446a7f7513211e4698d07357d20452909
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index 9edba09547e4..c0f63fd0c52b 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/include/net/mac80211.h
@@ -171,7 +171,7 @@ enum ieee80211_bss_change {
 	BSS_CHANGED_ERP_CTS_PROT	= 1<<1,
 	BSS_CHANGED_ERP_PREAMBLE	= 1<<2,
 	BSS_CHANGED_ERP_SLOT		= 1<<3,
-	BSS_CHANGED_HT                  = 1<<4,
+	BSS_CHANGED_HT			= 1<<4,
 	BSS_CHANGED_BASIC_RATES		= 1<<5,
 	BSS_CHANGED_BEACON_INT		= 1<<6,
 	BSS_CHANGED_BSSID		= 1<<7,
diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c
index 56c24cabf26d..836b2752ecd6 100644
--- a/trunk/net/mac80211/ibss.c
+++ b/trunk/net/mac80211/ibss.c
@@ -417,7 +417,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
  * must be callable in atomic context.
  */
 struct sta_info *ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata,
-					u8 *bssid,u8 *addr, u32 supp_rates,
+					u8 *bssid, u8 *addr, u32 supp_rates,
 					gfp_t gfp)
 {
 	struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;