new svn snapshot

diff --git a/Makefile.inc b/Makefile.inc
index 15a5e9b1de06491955082260544f0f19d10cd593..d0c444fa4a1f8978ca36291b3c47c055591f3e33 100644 (file)
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -146,7 +146,7 @@ ATH_RATE=   $(TOP)/ath_rate
 # 
 TOOLS=  $(TOP)/tools 
 
-WARNINGS = -Werror -Wall
+WARNINGS = -Wall
 COPTS+= $(WARNINGS)
 INCS=  -include $(TOP)/include/compat.h -I$(TOP)/include
 

diff --git a/SNAPSHOT b/SNAPSHOT
index 0c46a00100d9bfe9625579a47b91a102eb548e5e..9f240795bfb6d6960c4dc98192c6c61bd13dc857 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: 4167
+Revision: 4173
 Last Changed Author: proski
-Last Changed Rev: 4167
-Last Changed Date: 2011-08-26 17:38:40 +0200 (Fri, 26 Aug 2011)
+Last Changed Rev: 4173
+Last Changed Date: 2011-10-07 23:43:03 +0200 (Fri, 07 Oct 2011)

diff --git a/ath/if_ath.c b/ath/if_ath.c
index c06c2a30d12e738b108e733c654a594ae5905411..255be3399dab9feb1a570198fa813a622aa02c55 100644 (file)
--- a/ath/if_ath.c
+++ b/ath/if_ath.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: if_ath.c 4167 2011-08-26 15:38:40Z proski $
+ * $Id: if_ath.c 4171 2011-10-07 21:31:51Z proski $
  */
 
 /*
@@ -1207,7 +1207,9 @@ ath_vap_create(struct ieee80211com *ic, const char *name, int unit,
        }
        if (sc->sc_hastsfadd)
                ath_hal_settsfadjust(sc->sc_ah, sc->sc_stagbeacons);
-       SET_NETDEV_DEV(dev, ATH_GET_NETDEV_DEV(mdev));
+#ifdef ATH_PCI
+       SET_NETDEV_DEV(dev, &((struct pci_dev *)sc->sc_bdev)->dev);
+#endif
        /* complete setup */
        (void) ieee80211_vap_attach(vap,
                ieee80211_media_change, ieee80211_media_status);

diff --git a/ath/if_athvar.h b/ath/if_athvar.h
index 36fc3a75cdd6d95e16e2ef7592034cd6c2afecba..73147106a9809235162aec2b11e4d9953c0b4fee 100644 (file)
--- a/ath/if_athvar.h
+++ b/ath/if_athvar.h
@@ -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: if_athvar.h 4119 2010-01-31 07:06:30Z proski $
+ * $Id: if_athvar.h 4171 2011-10-07 21:31:51Z proski $
  */
 
 /*
@@ -116,12 +116,6 @@ typedef void irqreturn_t;
 #define        SET_NETDEV_DEV(ndev, pdev)
 #endif
 
-#ifdef to_net_dev
-#define ATH_GET_NETDEV_DEV(ndev)       ((ndev)->dev.parent)
-#else
-#define ATH_GET_NETDEV_DEV(ndev)       ((ndev)->class_dev.dev)
-#endif
-
 #ifndef        NETDEV_TX_OK
 #define        NETDEV_TX_OK    0
 #define        NETDEV_TX_BUSY  1

diff --git a/contrib/madwifi.spec b/contrib/madwifi.spec
index adda546f6f5e4e38c473ebf1eb1435f5c6489e8d..3e9b3bc5f81ed4143f3e710450a278d819afd54b 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       4167
-%define       snapshot       20110827
+%define       revision       4173
+%define       snapshot       20111008
 # branch is not used yet.
 %define       branch         trunk
 Summary: A linux device driver for Atheros chipsets (ar5210, ar5211, ar5212).

diff --git a/debian/changelog b/debian/changelog
index 710accc03a298f9f58c49e1d0871316643937e16..92a656332b3d8a48c1dce1b4a92bf21ca5930268 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,9 @@
-madwifi (1:0.9.4+r4167.20110827-1) UNRELEASED; urgency=low
-
-  IGNORE-VERSION: 1:0.9.4+r4167.20110827-1
-  only typos in comments/error messages fixed
+madwifi (1:0.9.4+r4173.20111008-1) UNRELEASED; urgency=low
 
   * NMU.
   * New upstream SVN snapshot.
 
- -- gregor herrmann <gregoa@debian.org>  Sat, 27 Aug 2011 17:48:40 +0200
+ -- gregor herrmann <gregoa@debian.org>  Sat, 08 Oct 2011 17:31:39 +0200
 
 madwifi (1:0.9.4+r4165.20110816-0.1) experimental; urgency=low
 

diff --git a/include/compat.h b/include/compat.h
index f3b14340889d874a2d57dc2f9c1ea4ed3b52c595..0e0b14313e86b1ff356fbc7a0b1256297b370cab 100644 (file)
--- a/include/compat.h
+++ b/include/compat.h
@@ -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: compat.h 4167 2011-08-26 15:38:40Z proski $
+ * $Id: compat.h 4169 2011-10-07 21:16:17Z proski $
  */
 #ifndef _ATH_COMPAT_H_
 #define _ATH_COMPAT_H_
@@ -66,8 +66,10 @@
 #endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)
+#ifndef netdev_for_each_mc_addr
 #define netdev_for_each_mc_addr(mclist, dev) \
-       for (mclist = dev->mc_list; mclist; mclist = mclist->next)
+       for (mclist = (dev)->mc_list; mclist; mclist = mclist->next)
+#endif
 #endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)