Update compat-wireless to 2.6.36-5-spn

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

 /*
  * Copyright (c) 2006   Jiri Benc <jbenc@suse.cz>
  * Copyright 2007       Johannes Berg <johannes@sipsolutions.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
 
 #include <linux/kernel.h>
@@ skipping 66 matching lines @@
 {                                                                       \
         return scnprintf(buf, buflen, format_string, sdata->field);     \
 }
 #define IEEE80211_IF_FMT_DEC(name, field)                               \
                 IEEE80211_IF_FMT(name, field, "%d\n")
 #define IEEE80211_IF_FMT_HEX(name, field)                               \
                 IEEE80211_IF_FMT(name, field, "%#x\n")
 #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,                      \
         char *buf, int buflen)                                          \
 {                                                                       \
         return scnprintf(buf, buflen, "%d\n", atomic_read(&sdata->field));\
 }
 
 #define IEEE80211_IF_FMT_MAC(name, field)                               \
 static ssize_t ieee80211_if_fmt_##name(                                 \
@@ skipping 46 matching lines @@
 IEEE80211_IF_FILE(rc_rateidx_mask_2ghz, rc_rateidx_mask[IEEE80211_BAND_2GHZ],
                   HEX);
 IEEE80211_IF_FILE(rc_rateidx_mask_5ghz, rc_rateidx_mask[IEEE80211_BAND_5GHZ],
                   HEX);
 
 /* STA attributes */
 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)
 {
         struct ieee80211_local *local = sdata->local;
         int err;
 
         if (!(local->hw.flags & IEEE80211_HW_SUPPORTS_STATIC_SMPS) &&
             smps_mode == IEEE80211_SMPS_STATIC)
                 return -EINVAL;
@@ skipping 119 matching lines @@
 {
         DEBUGFS_ADD(drop_unencrypted);
         DEBUGFS_ADD(rc_rateidx_mask_2ghz);
         DEBUGFS_ADD(rc_rateidx_mask_5ghz);
 
         DEBUGFS_ADD(bssid);
         DEBUGFS_ADD(aid);
         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)
 {
         DEBUGFS_ADD(drop_unencrypted);
         DEBUGFS_ADD(rc_rateidx_mask_2ghz);
         DEBUGFS_ADD(rc_rateidx_mask_5ghz);
 
         DEBUGFS_ADD(num_sta_ps);
         DEBUGFS_ADD(dtim_count);
@@ skipping 127 matching lines @@
         dir = sdata->debugfs.dir;
 
         if (!dir)
                 return;
 
         sprintf(buf, "netdev:%s", sdata->name);
         if (!debugfs_rename(dir->d_parent, dir, dir->d_parent, buf))
                 printk(KERN_ERR "mac80211: debugfs: failed to rename debugfs "
                        "dir to %s\n", buf);
 }