1 files changed, 13 insertions, 368 deletions

diff --git a/package/mac80211/src/mac80211/debugfs_netdev.c b/package/mac80211/src/mac80211/debugfs_netdev.c
index 52a32e4f6a..2b5e7615e5 100644
--- a/package/mac80211/src/mac80211/debugfs_netdev.c
+++ b/package/mac80211/src/mac80211/debugfs_netdev.c
@@ -87,267 +87,6 @@ static const struct file_operations name##_ops = {			\
 		IEEE80211_IF_FMT_##format(name, field)			\
 		__IEEE80211_IF_FILE(name)
 
-#define DEBUGFS_QOS_FILE(name, f)					\
-static ssize_t qos_ ##name## _write(struct file *file,			\
-				    const char __user *userbuf,		\
-				    size_t count, loff_t *ppos)		\
-{									\
-	struct ieee80211_sub_if_data *sdata = file->private_data;	\
-									\
-	f(sdata->dev, &sdata->u.sta, &sdata->u.sta.tspec);		\
-									\
-	return count;							\
-}									\
-									\
-static const struct file_operations qos_ ##name## _ops = {		\
-	.write = qos_ ##name## _write,					\
-	.open = mac80211_open_file_generic,				\
-};
-
-#define DEBUGFS_QOS_ADD(name)						\
-	sdata->debugfs.sta.qos.name = debugfs_create_file(#name, 0444, qosd,\
-		sdata, &qos_ ##name## _ops);
-
-#define DEBUGFS_QOS_DEL(name)						\
-	do {								\
-		debugfs_remove(sdata->debugfs.sta.qos.name);		\
-		sdata->debugfs.sta.qos.name = NULL;			\
-	} while (0)
-
-DEBUGFS_QOS_FILE(addts_11e, ieee80211_send_addts);
-DEBUGFS_QOS_FILE(addts_wmm, wmm_send_addts);
-DEBUGFS_QOS_FILE(delts_11e, ieee80211_send_delts);
-DEBUGFS_QOS_FILE(delts_wmm, wmm_send_delts);
-
-static ssize_t qos_if_dls_mac(const struct ieee80211_sub_if_data *sdata,
-			      char *buf, int buflen)
-{
-	return scnprintf(buf, buflen, MAC_FMT "\n",
-			 MAC_ARG(sdata->u.sta.dls_mac));
-}
-
-static ssize_t qos_dls_mac_read(struct file *file,
-				char __user *userbuf,
-				size_t count, loff_t *ppos)
-{
-	return ieee80211_if_read(file->private_data,
-				 userbuf, count, ppos,
-				 qos_if_dls_mac);
-}
-
-static ssize_t qos_dls_mac_write(struct file *file, const char __user *userbuf,
-				 size_t count, loff_t *ppos)
-{
-	struct ieee80211_sub_if_data *sdata = file->private_data;
-	char buf[20];
-	size_t size;
-	u8 m[ETH_ALEN];
-
-	size = min(sizeof(buf) - 1, count);
-	buf[size] = '\0';
-	if (copy_from_user(buf, userbuf, size))
-		return -EFAULT;
-
-	if (sscanf(buf, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
-		   &((u8*)(m))[0], &((u8*)(m))[1], &((u8*)(m))[2],
-		   &((u8*)(m))[3], &((u8*)(m))[4], &((u8*)(m))[5]) != ETH_ALEN){
-		printk(KERN_ERR "%s: sscanf input error\n", sdata->dev->name);
-		return -EINVAL;
-	}
-	memcpy(sdata->u.sta.dls_mac, m, ETH_ALEN);
-	return count;
-}
-
-static const struct file_operations qos_dls_mac_ops = {
-	.read = qos_dls_mac_read,
-	.write = qos_dls_mac_write,
-	.open = mac80211_open_file_generic,
-};
-
-static ssize_t qos_if_dls_op(const struct ieee80211_sub_if_data *sdata,
-			     char *buf, int buflen)
-{
-	return scnprintf(buf, buflen,
-			 "DLS Operation: Setup = 1; Teardown = 2\n");
-}
-
-static ssize_t qos_dls_op_read(struct file *file, char __user *userbuf,
-			       size_t count, loff_t *ppos)
-{
-	return ieee80211_if_read(file->private_data,
-				 userbuf, count, ppos,
-				 qos_if_dls_op);
-}
-
-static ssize_t qos_dls_op_write(struct file *file, const char __user *userbuf,
-				 size_t count, loff_t *ppos)
-{
-	struct ieee80211_sub_if_data *sdata = file->private_data;
-	char buf[20];
-	size_t size;
-	unsigned int opt;
-
-	size = min(sizeof(buf) - 1, count);
-	buf[size] = '\0';
-	if (copy_from_user(buf, userbuf, size))
-		return -EFAULT;
-
-	if (sscanf(buf, "%u", &opt) != 1) {
-		printk(KERN_ERR "%s: sscanf input error\n", sdata->dev->name);
-		return -EINVAL;
-	}
-	switch (opt) {
-	case 1:
-		ieee80211_send_dls_req(sdata->dev, &sdata->u.sta,
-				       sdata->u.sta.dls_mac, 0);
-		break;
-	case 2:
-		ieee80211_send_dls_teardown(sdata->dev, &sdata->u.sta,
-					    sdata->u.sta.dls_mac,
-					    WLAN_REASON_QSTA_NOT_USE);
-		break;
-	default:
-		printk(KERN_ERR "Unknown DLS Operation: %d\n", opt);
-		break;
-	}
-	return count;
-}
-
-static const struct file_operations qos_dls_op_ops = {
-	.read = qos_dls_op_read,
-	.write = qos_dls_op_write,
-	.open = mac80211_open_file_generic,
-};
-
-#define DEBUGFS_TSINFO_FILE(_name, min_val, max_val)			\
-static ssize_t tsinfo_ ##_name## _read(struct file *file,		\
-				       char __user *userbuf,		\
-				       size_t count, loff_t *ppos)	\
-{									\
-	char buf[20];							\
-	struct ieee80211_sub_if_data *sdata = file->private_data;	\
-	int res = scnprintf(buf, count, "%u\n",				\
-		IEEE80211_TSINFO_## _name (sdata->u.sta.tspec.ts_info));\
-	return simple_read_from_buffer(userbuf, count, ppos, buf, res);	\
-}									\
-									\
-static ssize_t tsinfo_ ##_name## _write(struct file *file,		\
-				        const char __user *userbuf,	\
-				        size_t count, loff_t *ppos)	\
-{									\
-	char buf[20];							\
-	size_t size;							\
-	int val;							\
-	struct ieee80211_sub_if_data *sdata = file->private_data;	\
-									\
-	size = min(sizeof(buf) - 1, count);				\
-	buf[size] = '\0';						\
-	if (copy_from_user(buf, userbuf, size))				\
-		return -EFAULT;						\
-									\
-	val = simple_strtoul(buf, NULL, 0);				\
-	if ((val < min_val) || (val > max_val)) {			\
-		printk(KERN_ERR "%s: set value (%u) out of range "	\
-		       "[%u, %u]\n",sdata->dev->name,val,min_val,max_val);\
-		return -EINVAL;						\
-	}								\
-	IEEE80211_SET_TSINFO_ ##_name (sdata->u.sta.tspec.ts_info, val);\
-	return count;							\
-}									\
-									\
-static const struct file_operations tsinfo_ ##_name## _ops = {		\
-	.read = tsinfo_ ##_name## _read,				\
-	.write = tsinfo_ ##_name## _write,				\
-	.open = mac80211_open_file_generic,				\
-};
-
-#define DEBUGFS_TSINFO_ADD_TSID						\
-	sdata->debugfs.sta.tsinfo.tsid =				\
-		debugfs_create_file("tsid", 0444, tsinfod,		\
-				    sdata, &tsinfo_TSID_ops);
-
-#define DEBUGFS_TSINFO_ADD_DIR						\
-	sdata->debugfs.sta.tsinfo.direction =				\
-		debugfs_create_file("direction", 0444, tsinfod,		\
-				    sdata, &tsinfo_DIR_ops);
-
-#define DEBUGFS_TSINFO_ADD_UP						\
-	sdata->debugfs.sta.tsinfo.up =					\
-		debugfs_create_file("up", 0444, tsinfod,		\
-				    sdata, &tsinfo_UP_ops);
-
-#define DEBUGFS_TSINFO_DEL(name)					\
-	do {								\
-		debugfs_remove(sdata->debugfs.sta.tsinfo.name);		\
-		sdata->debugfs.sta.tsinfo.name = NULL;			\
-	} while (0)
-
-DEBUGFS_TSINFO_FILE(TSID, 8, 15);
-DEBUGFS_TSINFO_FILE(DIR, 0, 3);
-DEBUGFS_TSINFO_FILE(UP, 0, 7);
-
-#define DEBUGFS_TSPEC_FILE(name, format_string, endian_f1, endian_f2)	\
-static ssize_t tspec_ ##name## _read(struct file *file,			\
-				      char __user *userbuf,		\
-				      size_t count, loff_t *ppos)	\
-{									\
-	char buf[20];							\
-	struct ieee80211_sub_if_data *sdata = file->private_data;	\
-	int res = scnprintf(buf, count, format_string "\n",		\
-			    endian_f1(sdata->u.sta.tspec.name));	\
-	return simple_read_from_buffer(userbuf, count, ppos, buf, res);	\
-}									\
-									\
-static ssize_t tspec_ ##name## _write(struct file *file,		\
-				       const char __user *userbuf,	\
-				       size_t count, loff_t *ppos)	\
-{									\
-	char buf[20];							\
-	size_t size;							\
-	struct ieee80211_sub_if_data *sdata = file->private_data;	\
-									\
-	size = min(sizeof(buf) - 1, count);				\
-	buf[size] = '\0';						\
-	if (copy_from_user(buf, userbuf, size))				\
-		return -EFAULT;						\
-									\
-	sdata->u.sta.tspec.name = endian_f2(simple_strtoul(buf, NULL, 0));\
-	return count;							\
-}									\
-									\
-static const struct file_operations tspec_ ##name## _ops = {		\
-	.read = tspec_ ##name## _read,					\
-	.write = tspec_ ##name## _write,				\
-	.open = mac80211_open_file_generic,				\
-};
-
-#define DEBUGFS_TSPEC_ADD(name)						\
-	sdata->debugfs.sta.tspec.name = debugfs_create_file(#name,	\
-		0444, tspecd, sdata, &tspec_ ##name## _ops);
-
-#define DEBUGFS_TSPEC_DEL(name)						\
-	do {								\
-		debugfs_remove(sdata->debugfs.sta.tspec.name);		\
-		sdata->debugfs.sta.tspec.name = NULL;			\
-	} while (0)
-
-DEBUGFS_TSPEC_FILE(nominal_msdu_size, "%hu", le16_to_cpu, cpu_to_le16);
-DEBUGFS_TSPEC_FILE(max_msdu_size, "%hu", le16_to_cpu, cpu_to_le16);
-DEBUGFS_TSPEC_FILE(min_service_interval, "%u", le32_to_cpu, cpu_to_le32);
-DEBUGFS_TSPEC_FILE(max_service_interval, "%u", le32_to_cpu, cpu_to_le32);
-DEBUGFS_TSPEC_FILE(inactivity_interval, "%u", le32_to_cpu, cpu_to_le32);
-DEBUGFS_TSPEC_FILE(suspension_interval, "%u", le32_to_cpu, cpu_to_le32);
-DEBUGFS_TSPEC_FILE(service_start_time, "%u", le32_to_cpu, cpu_to_le32);
-DEBUGFS_TSPEC_FILE(min_data_rate, "%u", le32_to_cpu, cpu_to_le32);
-DEBUGFS_TSPEC_FILE(mean_data_rate, "%u", le32_to_cpu, cpu_to_le32);
-DEBUGFS_TSPEC_FILE(peak_data_rate, "%u", le32_to_cpu, cpu_to_le32);
-DEBUGFS_TSPEC_FILE(burst_size, "%u", le32_to_cpu, cpu_to_le32);
-DEBUGFS_TSPEC_FILE(delay_bound, "%u", le32_to_cpu, cpu_to_le32);
-DEBUGFS_TSPEC_FILE(min_phy_rate, "%u", le32_to_cpu, cpu_to_le32);
-DEBUGFS_TSPEC_FILE(surplus_band_allow, "%hu", le16_to_cpu, cpu_to_le16);
-DEBUGFS_TSPEC_FILE(medium_time, "%hu", le16_to_cpu, cpu_to_le16);
-
-
 /* common attributes */
 IEEE80211_IF_FILE(channel_use, channel_use, DEC);
 IEEE80211_IF_FILE(drop_unencrypted, drop_unencrypted, DEC);
@@ -373,13 +112,13 @@ static ssize_t ieee80211_if_fmt_flags(
 	const struct ieee80211_sub_if_data *sdata, char *buf, int buflen)
 {
 	return scnprintf(buf, buflen, "%s%s%s%s%s%s%s\n",
-			 sdata->u.sta.ssid_set ? "SSID\n" : "",
-			 sdata->u.sta.bssid_set ? "BSSID\n" : "",
-			 sdata->u.sta.prev_bssid_set ? "prev BSSID\n" : "",
-			 sdata->u.sta.authenticated ? "AUTH\n" : "",
-			 sdata->u.sta.associated ? "ASSOC\n" : "",
-			 sdata->u.sta.probereq_poll ? "PROBEREQ POLL\n" : "",
-			 sdata->u.sta.use_protection ? "CTS prot\n" : "");
+		 sdata->u.sta.flags & IEEE80211_STA_SSID_SET ? "SSID\n" : "",
+		 sdata->u.sta.flags & IEEE80211_STA_BSSID_SET ? "BSSID\n" : "",
+		 sdata->u.sta.flags & IEEE80211_STA_PREV_BSSID_SET ? "prev BSSID\n" : "",
+		 sdata->u.sta.flags & IEEE80211_STA_AUTHENTICATED ? "AUTH\n" : "",
+		 sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED ? "ASSOC\n" : "",
+		 sdata->u.sta.flags & IEEE80211_STA_PROBEREQ_POLL ? "PROBEREQ POLL\n" : "",
+		 sdata->flags & IEEE80211_SDATA_USE_PROTECTION ? "CTS prot\n" : "");
 }
 __IEEE80211_IF_FILE(flags);
 
@@ -422,33 +161,12 @@ __IEEE80211_IF_FILE(beacon_tail_len);
 /* WDS attributes */
 IEEE80211_IF_FILE(peer, u.wds.remote_addr, MAC);
 
-/* VLAN attributes */
-IEEE80211_IF_FILE(vlan_id, u.vlan.id, DEC);
-
-/* MONITOR attributes */
-static ssize_t ieee80211_if_fmt_mode(
-	const struct ieee80211_sub_if_data *sdata, char *buf, int buflen)
-{
-	struct ieee80211_local *local = sdata->local;
-
-	return scnprintf(buf, buflen, "%s\n",
-			 ((local->hw.flags & IEEE80211_HW_MONITOR_DURING_OPER) ||
-			  local->open_count == local->monitors) ?
-			 "hard" : "soft");
-}
-__IEEE80211_IF_FILE(mode);
-
-
 #define DEBUGFS_ADD(name, type)\
 	sdata->debugfs.type.name = debugfs_create_file(#name, 0444,\
 		sdata->debugfsdir, sdata, &name##_ops);
 
 static void add_sta_files(struct ieee80211_sub_if_data *sdata)
 {
-	struct dentry *qosd;
-	struct dentry *tsinfod;
-	struct dentry *tspecd;
-
 	DEBUGFS_ADD(channel_use, sta);
 	DEBUGFS_ADD(drop_unencrypted, sta);
 	DEBUGFS_ADD(eapol, sta);
@@ -467,42 +185,6 @@ static void add_sta_files(struct ieee80211_sub_if_data *sdata)
 	DEBUGFS_ADD(auth_alg, sta);
 	DEBUGFS_ADD(auth_transaction, sta);
 	DEBUGFS_ADD(flags, sta);
-
-	qosd = debugfs_create_dir("qos", sdata->debugfsdir);
-	sdata->debugfs.sta.qos_dir = qosd;
-
-	DEBUGFS_QOS_ADD(addts_11e);
-	DEBUGFS_QOS_ADD(addts_wmm);
-	DEBUGFS_QOS_ADD(delts_11e);
-	DEBUGFS_QOS_ADD(delts_wmm);
-	DEBUGFS_QOS_ADD(dls_mac);
-	DEBUGFS_QOS_ADD(dls_op);
-
-	tsinfod = debugfs_create_dir("ts_info", qosd);
-	sdata->debugfs.sta.tsinfo_dir = tsinfod;
-
-	DEBUGFS_TSINFO_ADD_TSID;
-	DEBUGFS_TSINFO_ADD_DIR;
-	DEBUGFS_TSINFO_ADD_UP;
-
-	tspecd = debugfs_create_dir("tspec", qosd);
-	sdata->debugfs.sta.tspec_dir = tspecd;
-
-	DEBUGFS_TSPEC_ADD(nominal_msdu_size);
-	DEBUGFS_TSPEC_ADD(max_msdu_size);
-	DEBUGFS_TSPEC_ADD(min_service_interval);
-	DEBUGFS_TSPEC_ADD(max_service_interval);
-	DEBUGFS_TSPEC_ADD(inactivity_interval);
-	DEBUGFS_TSPEC_ADD(suspension_interval);
-	DEBUGFS_TSPEC_ADD(service_start_time);
-	DEBUGFS_TSPEC_ADD(min_data_rate);
-	DEBUGFS_TSPEC_ADD(mean_data_rate);
-	DEBUGFS_TSPEC_ADD(peak_data_rate);
-	DEBUGFS_TSPEC_ADD(burst_size);
-	DEBUGFS_TSPEC_ADD(delay_bound);
-	DEBUGFS_TSPEC_ADD(min_phy_rate);
-	DEBUGFS_TSPEC_ADD(surplus_band_allow);
-	DEBUGFS_TSPEC_ADD(medium_time);
 }
 
 static void add_ap_files(struct ieee80211_sub_if_data *sdata)
@@ -537,12 +219,10 @@ static void add_vlan_files(struct ieee80211_sub_if_data *sdata)
 	DEBUGFS_ADD(drop_unencrypted, vlan);
 	DEBUGFS_ADD(eapol, vlan);
 	DEBUGFS_ADD(ieee8021_x, vlan);
-	DEBUGFS_ADD(vlan_id, vlan);
 }
 
 static void add_monitor_files(struct ieee80211_sub_if_data *sdata)
 {
-	DEBUGFS_ADD(mode, monitor);
 }
 
 static void add_files(struct ieee80211_sub_if_data *sdata)
@@ -598,40 +278,6 @@ static void del_sta_files(struct ieee80211_sub_if_data *sdata)
 	DEBUGFS_DEL(auth_alg, sta);
 	DEBUGFS_DEL(auth_transaction, sta);
 	DEBUGFS_DEL(flags, sta);
-
-	DEBUGFS_TSINFO_DEL(tsid);
-	DEBUGFS_TSINFO_DEL(direction);
-	DEBUGFS_TSINFO_DEL(up);
-
-	DEBUGFS_TSPEC_DEL(nominal_msdu_size);
-	DEBUGFS_TSPEC_DEL(max_msdu_size);
-	DEBUGFS_TSPEC_DEL(min_service_interval);
-	DEBUGFS_TSPEC_DEL(max_service_interval);
-	DEBUGFS_TSPEC_DEL(inactivity_interval);
-	DEBUGFS_TSPEC_DEL(suspension_interval);
-	DEBUGFS_TSPEC_DEL(service_start_time);
-	DEBUGFS_TSPEC_DEL(min_data_rate);
-	DEBUGFS_TSPEC_DEL(mean_data_rate);
-	DEBUGFS_TSPEC_DEL(peak_data_rate);
-	DEBUGFS_TSPEC_DEL(burst_size);
-	DEBUGFS_TSPEC_DEL(delay_bound);
-	DEBUGFS_TSPEC_DEL(min_phy_rate);
-	DEBUGFS_TSPEC_DEL(surplus_band_allow);
-	DEBUGFS_TSPEC_DEL(medium_time);
-
-	DEBUGFS_QOS_DEL(addts_11e);
-	DEBUGFS_QOS_DEL(addts_wmm);
-	DEBUGFS_QOS_DEL(delts_11e);
-	DEBUGFS_QOS_DEL(delts_wmm);
-	DEBUGFS_QOS_DEL(dls_mac);
-	DEBUGFS_QOS_DEL(dls_op);
-
-	debugfs_remove(sdata->debugfs.sta.tspec_dir);
-	sdata->debugfs.sta.tspec_dir = NULL;
-	debugfs_remove(sdata->debugfs.sta.tsinfo_dir);
-	sdata->debugfs.sta.tsinfo_dir = NULL;
-	debugfs_remove(sdata->debugfs.sta.qos_dir);
-	sdata->debugfs.sta.qos_dir = NULL;
 }
 
 static void del_ap_files(struct ieee80211_sub_if_data *sdata)
@@ -666,12 +312,10 @@ static void del_vlan_files(struct ieee80211_sub_if_data *sdata)
 	DEBUGFS_DEL(drop_unencrypted, vlan);
 	DEBUGFS_DEL(eapol, vlan);
 	DEBUGFS_DEL(ieee8021_x, vlan);
-	DEBUGFS_DEL(vlan_id, vlan);
 }
 
 static void del_monitor_files(struct ieee80211_sub_if_data *sdata)
 {
-	DEBUGFS_DEL(mode, monitor);
 }
 
 static void del_files(struct ieee80211_sub_if_data *sdata, int type)
@@ -734,9 +378,9 @@ static int netdev_notify(struct notifier_block * nb,
 			 void *ndev)
 {
 	struct net_device *dev = ndev;
-	/* TODO
+	struct dentry *dir;
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 	char buf[10+IFNAMSIZ];
-	*/
 
 	if (state != NETDEV_CHANGENAME)
 		return 0;
@@ -747,10 +391,11 @@ static int netdev_notify(struct notifier_block * nb,
 	if (dev->ieee80211_ptr->wiphy->privid != mac80211_wiphy_privid)
 		return 0;
 
-	/* TODO
 	sprintf(buf, "netdev:%s", dev->name);
-	debugfs_rename(IEEE80211_DEV_TO_SUB_IF(dev)->debugfsdir, buf);
-	*/
+	dir = sdata->debugfsdir;
+	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);
 
 	return 0;
 }