Update compat-wireless to 2.6.36-5-spn

chromeos/compat-wireless/net/mac80211/debugfs_netdev.c

Index: chromeos/compat-wireless/net/mac80211/debugfs_netdev.c
diff --git a/chromeos/compat-wireless/net/mac80211/debugfs_netdev.c b/chromeos/compat-wireless/net/mac80211/debugfs_netdev.c
index ca655b86d315a8fb3bdbc1f2b298615e83ee83f2..20b2998fa0ed07b68b410f77a82d0f159603d79e 100644
--- a/chromeos/compat-wireless/net/mac80211/debugfs_netdev.c
+++ b/chromeos/compat-wireless/net/mac80211/debugfs_netdev.c
@@ -84,15 +84,6 @@ static ssize_t ieee80211_if_fmt_##name(					\
 #define IEEE80211_IF_FMT_SIZE(name, field)				\
 		IEEE80211_IF_FMT(name, field, "%zd\n")
 
-#define IEEE80211_IF_FMT_BOOL(name, field)				\
-static ssize_t ieee80211_if_fmt_##name(					\
-	const struct ieee80211_sub_if_data *sdata, char *buf,		\
-	int buflen)							\
-{									\
-	return scnprintf(buf, buflen, "%s\n", sdata->field ?		\
-			"true" : "false");				\

[Sam Leffler, 2010/12/01 00:23:44]

dropped local changes

-}
-
 #define IEEE80211_IF_FMT_ATOMIC(name, field)				\
 static ssize_t ieee80211_if_fmt_##name(					\
 	const struct ieee80211_sub_if_data *sdata,			\
@@ -159,11 +150,6 @@ IEEE80211_IF_FILE(bssid, u.mgd.bssid, MAC);
 IEEE80211_IF_FILE(aid, u.mgd.aid, DEC);
 IEEE80211_IF_FILE(last_beacon, u.mgd.last_beacon_signal, DEC);
 IEEE80211_IF_FILE(ave_beacon, u.mgd.ave_beacon_signal, DEC_DIV_16);
-IEEE80211_IF_FILE(dtim_period, local->hw.conf.ps_dtim_period, DEC);
-IEEE80211_IF_FILE(beacon_int, vif.bss_conf.beacon_int, DEC);
-IEEE80211_IF_FILE(cts_prot, vif.bss_conf.use_cts_prot, BOOL);
-IEEE80211_IF_FILE(short_preamble, vif.bss_conf.use_short_preamble, BOOL);
-IEEE80211_IF_FILE(short_slot, vif.bss_conf.use_short_slot, BOOL);

[Sam Leffler, 2010/12/01 00:23:44]

local changes

 
 static int ieee80211_set_smps(struct ieee80211_sub_if_data *sdata,
 			      enum ieee80211_smps_mode smps_mode)
@@ -303,11 +289,6 @@ static void add_sta_files(struct ieee80211_sub_if_data *sdata)
 	DEBUGFS_ADD(last_beacon);
 	DEBUGFS_ADD(ave_beacon);
 	DEBUGFS_ADD_MODE(smps, 0600);
-	DEBUGFS_ADD(dtim_period);
-	DEBUGFS_ADD(beacon_int);
-	DEBUGFS_ADD(cts_prot);
-	DEBUGFS_ADD(short_preamble);
-	DEBUGFS_ADD(short_slot);

[Sam Leffler, 2010/12/01 00:23:44]

local changes

 }
 
 static void add_ap_files(struct ieee80211_sub_if_data *sdata)