Project : madwifi
Revision : 2655
Author : mtaylor (Michael Taylor)
Date : 2007-08-16 18:27:23 +0200 (Thu, 16 Aug 2007)
Log Message :
Merge to trunk r2652
Affected Files:
* branches/madwifi-dfs/ath_rate/minstrel/minstrel.c updated
* branches/madwifi-dfs/ath_rate/sample/sample.c updated
* branches/madwifi-dfs/net80211/ieee80211_linux.c updated
* branches/madwifi-dfs/net80211/ieee80211_wireless.c updated
* branches/madwifi-dfs/scripts/madwifi-indent updated
Modified: branches/madwifi-dfs/ath_rate/minstrel/minstrel.c
===================================================================
--- branches/madwifi-dfs/ath_rate/minstrel/minstrel.c 2007-08-14 14:03:01 UTC
(rev 2654)
+++ branches/madwifi-dfs/ath_rate/minstrel/minstrel.c 2007-08-16 16:27:23 UTC
(rev 2655)
@@ -672,6 +672,12 @@
}
for (x = 0; x < ni->ni_rates.rs_nrates; x++) {
+ if (sn->rates[x].rix == 0xff) {
+ DPRINTF(sc, "%s: %s ignore bogus rix at %d\n",
+ dev_info, __func__, x);
+ continue;
+ }
+
sn->rs_rateattempts [x] = 0;
sn->rs_thisprob [x] = 0;
sn->rs_ratesuccess [x] = 0;
Modified: branches/madwifi-dfs/ath_rate/sample/sample.c
===================================================================
--- branches/madwifi-dfs/ath_rate/sample/sample.c 2007-08-14 14:03:01 UTC
(rev 2654)
+++ branches/madwifi-dfs/ath_rate/sample/sample.c 2007-08-16 16:27:23 UTC
(rev 2655)
@@ -896,6 +896,11 @@
sn->last_sample_ndx[y] = 0;
for (x = 0; x < ni->ni_rates.rs_nrates; x++) {
+ if (sn->rates[x].rix == 0xff) {
+ DPRINTF(sc, ATH_DEBUG_RATE, "%s: %s ignore
bogus rix at %u\n",
+ dev_info, __func__, x);
+ continue;
+ }
sn->stats[y][x].successive_failures = 0;
sn->stats[y][x].tries = 0;
sn->stats[y][x].total_packets = 0;
Modified: branches/madwifi-dfs/net80211/ieee80211_linux.c
===================================================================
--- branches/madwifi-dfs/net80211/ieee80211_linux.c 2007-08-14 14:03:01 UTC
(rev 2654)
+++ branches/madwifi-dfs/net80211/ieee80211_linux.c 2007-08-16 16:27:23 UTC
(rev 2655)
@@ -60,7 +60,7 @@
#include <net80211/ieee80211_var.h>
#include <net80211/ieee80211_monitor.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
#include <linux/device.h>
/* madwifi_name_type - device name type:
@@ -102,7 +102,7 @@
.name = NULL, /* No seperate (sub-)directory */
.attrs = ieee80211_sysfs_attrs
};
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) */
/*
* Print a console message with the device name prepended.
@@ -717,7 +717,7 @@
int i, space;
char *devname = NULL;
struct ieee80211_proc_entry *tmp = NULL;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
int ret;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
@@ -735,7 +735,7 @@
__func__, vap->iv_dev->name);
return;
}
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) */
space = 5 * sizeof(struct ctl_table) +
sizeof(ieee80211_sysctl_template);
vap->iv_sysctls = kmalloc(space, GFP_KERNEL);
@@ -905,7 +905,7 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
sysfs_remove_group(&vap->iv_dev->dev.kobj, &ieee80211_attr_grp);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
sysfs_remove_group(&vap->iv_dev->class_dev.kobj, &ieee80211_attr_grp);
#endif
Modified: branches/madwifi-dfs/net80211/ieee80211_wireless.c
===================================================================
--- branches/madwifi-dfs/net80211/ieee80211_wireless.c 2007-08-14 14:03:01 UTC
(rev 2654)
+++ branches/madwifi-dfs/net80211/ieee80211_wireless.c 2007-08-16 16:27:23 UTC
(rev 2655)
@@ -1109,10 +1109,11 @@
} else {
spy_stat[i].updated = 0;
}
+
+ ieee80211_unref_node(&ni);
} else {
spy_stat[i].updated = IW_QUAL_ALL_INVALID;
}
- ieee80211_unref_node(&ni);
}
/* copy results to userspace */
Modified: branches/madwifi-dfs/scripts/madwifi-indent
===================================================================
--- branches/madwifi-dfs/scripts/madwifi-indent 2007-08-14 14:03:01 UTC (rev
2654)
+++ branches/madwifi-dfs/scripts/madwifi-indent 2007-08-16 16:27:23 UTC (rev
2655)
@@ -16,3 +16,7 @@
-T HAL_TXQ_INFO -T HAL_INT -T HAL_KEYVAL -T HAL_MIB_STATS \
-T HAL_NODE_STATS -T HAL_RATE_TABLE -T HAL_STATUS \
"$@"
+
+for i in "$@"; do
+ sed -i -e 's/^ *\([^ :]\+:\)$/\1/;s/\(__attribute__\) ((/\1((/g' $i
+done
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
|
