Imported Upstream version 0.9.4+r4180.20120502

diff --git a/SNAPSHOT b/SNAPSHOT
index 3f76f874fe32a6dc15666a86b02204db20eeac37..9419c1f85124a54e70fea7daf96c0b6e8d8353d6 100644 (file)
--- a/SNAPSHOT
+++ b/SNAPSHOT
@@ -2,7 +2,7 @@ Path: madwifi/branches/madwifi-0.9.4
 URL: http://svn.madwifi-project.org/madwifi/branches/madwifi-0.9.4
 Repository Root: http://svn.madwifi-project.org
 Repository UUID: 0192ed92-7a03-0410-a25b-9323aeb14dbd
-Revision: 4178
+Revision: 4180
 Last Changed Author: proski
-Last Changed Rev: 4178
-Last Changed Date: 2012-01-30 20:56:17 +0100 (Mon, 30 Jan 2012)
+Last Changed Rev: 4180
+Last Changed Date: 2012-05-01 21:55:40 +0200 (Tue, 01 May 2012)

diff --git a/contrib/madwifi.spec b/contrib/madwifi.spec
index 4b575dafb7f8c4ae6397483e86339efc57d69c3d..a2808bbd9d58c315511c1037b2368c9b9764fbf9 100644 (file)
--- a/contrib/madwifi.spec
+++ b/contrib/madwifi.spec
@@ -10,8 +10,8 @@
 %define       mykrelver         %(echo %{mykversion} | tr -s '-' '_')
 # Define based on the tar ball extract.
 # Those two variable will be instanced during the tarball generation
-%define       revision       4178
-%define       snapshot       20120131
+%define       revision       4180
+%define       snapshot       20120502
 # branch is not used yet.
 %define       branch         trunk
 Summary: A linux device driver for Atheros chipsets (ar5210, ar5211, ar5212).

diff --git a/tools/80211stats.c b/tools/80211stats.c
index e8af41c3228b7c003d49dad2186e97c5003b6b52..14613ac4fb03c8528a5d197bcdf67f1447ddd6cb 100644 (file)
--- a/tools/80211stats.c
+++ b/tools/80211stats.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: 80211stats.c 2088 2007-02-07 03:18:49Z proski $
+ * $Id: 80211stats.c 4180 2012-05-01 19:55:40Z proski $
  */
 
 /*
@@ -287,7 +287,7 @@ main(int argc, char *argv[])
                /* no args, just show global stats */
                ifr.ifr_data = (caddr_t) &stats;
                if (ioctl(s, SIOCG80211STATS, &ifr) < 0)
-                       err(1, ifr.ifr_name);
+                       err(1, "%s", ifr.ifr_name);
                printstats(stdout, &stats);
                return 0;
        }

diff --git a/tools/athstats.c b/tools/athstats.c
index d3ba809b52234396535707cdcd47529da503ac28..c480afaf1ed5f7e16db49b63370c8ae7e851b5b7 100644 (file)
--- a/tools/athstats.c
+++ b/tools/athstats.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $Id: athstats.c 1936 2007-01-12 02:45:36Z proski $
+ * $Id: athstats.c 4180 2012-05-01 19:55:40Z proski $
  */
 
 /*
@@ -282,9 +282,9 @@ main(int argc, char *argv[])
                if (line != 0) {
                        ifr.ifr_data = (caddr_t) &cur;
                        if (ioctl(s, SIOCGATHSTATS, &ifr) < 0)
-                               err(1, ifr.ifr_name);
+                               err(1, "%s", ifr.ifr_name);
                        if (!getifstats(ifr.ifr_name, &icur, &ocur))
-                               err(1, ifr.ifr_name);
+                               err(1, "%s", ifr.ifr_name);
                        printf("%8lu %8lu %7u %7u %7u %6u %6u %6u %7u %4u %3uM\n",
                                (icur - itot) -
                                        (cur.ast_rx_mgt - total.ast_rx_mgt),
@@ -304,9 +304,9 @@ main(int argc, char *argv[])
                } else {
                        ifr.ifr_data = (caddr_t) &total;
                        if (ioctl(s, SIOCGATHSTATS, &ifr) < 0)
-                               err(1, ifr.ifr_name);
+                               err(1, "%s", ifr.ifr_name);
                        if (!getifstats(ifr.ifr_name, &itot, &otot))
-                               err(1, ifr.ifr_name);
+                               err(1, "%s", ifr.ifr_name);
                        printf("%8lu %8lu %7u %7u %7u %6u %6u %6u %7u %4u %3uM\n",
                                itot - total.ast_rx_mgt,
                                otot,
@@ -341,7 +341,7 @@ main(int argc, char *argv[])
 
                ifr.ifr_data = (caddr_t) &stats;
                if (ioctl(s, SIOCGATHSTATS, &ifr) < 0)
-                       err(1, ifr.ifr_name);
+                       err(1, "%s", ifr.ifr_name);
                printstats(stdout, &stats);
        }
        return 0;