[svn-upgrade] new version madwifi (0.9.4+r4176.20111123)

diff --git a/SNAPSHOT b/SNAPSHOT
index 9f240795bfb6d6960c4dc98192c6c61bd13dc857..1a6bd447c9b544880a28f9dd9e0f28371f6e0f95 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: 4173
+Revision: 4176
 Last Changed Author: proski
-Last Changed Rev: 4173
-Last Changed Date: 2011-10-07 23:43:03 +0200 (Fri, 07 Oct 2011)
+Last Changed Rev: 4176
+Last Changed Date: 2011-11-22 18:30:17 +0100 (Tue, 22 Nov 2011)

diff --git a/ath/if_ath.c b/ath/if_ath.c
index 255be3399dab9feb1a570198fa813a622aa02c55..76fb34ed4f28f8b58df389176785fee147edb609 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 4171 2011-10-07 21:31:51Z proski $
+ * $Id: if_ath.c 4176 2011-11-22 17:30:17Z proski $
  */
 
 /*
@@ -402,7 +402,11 @@ static const struct net_device_ops ath_netdev_ops = {
        .ndo_stop               = ath_stop,
        .ndo_start_xmit         = ath_hardstart,
        .ndo_tx_timeout         = ath_tx_timeout,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+       .ndo_set_rx_mode        = ath_mode_init,
+#else
        .ndo_set_multicast_list = ath_mode_init,
+#endif
        .ndo_do_ioctl           = ath_ioctl,
        .ndo_get_stats          = ath_getstats,
        .ndo_set_mac_address    = ath_set_mac_address,

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

diff --git a/net80211/ieee80211.c b/net80211/ieee80211.c
index 01d4925c783a0540a6414998284855b2eba51b20..ae768e00e828fce30327ac31f88ceded1183bb19 100644 (file)
--- a/net80211/ieee80211.c
+++ b/net80211/ieee80211.c
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ieee80211.c 4167 2011-08-26 15:38:40Z proski $
+ * $Id: ieee80211.c 4176 2011-11-22 17:30:17Z proski $
  */
 #ifndef EXPORT_SYMTAB
 #define        EXPORT_SYMTAB
@@ -377,7 +377,11 @@ static const struct net_device_ops ieee80211_netdev_ops = {
        .ndo_open               = ieee80211_open,
        .ndo_stop               = ieee80211_stop,
        .ndo_start_xmit         = ieee80211_hardstart,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+       .ndo_set_rx_mode        = ieee80211_set_multicast_list,
+#else
        .ndo_set_multicast_list = ieee80211_set_multicast_list,
+#endif
        .ndo_change_mtu         = ieee80211_change_mtu,
        .ndo_do_ioctl           = ieee80211_ioctl,
 #if IEEE80211_VLAN_TAG_USED
@@ -1542,10 +1546,14 @@ ieee80211_set_multicast_list(struct net_device *dev)
        IEEE80211_UNLOCK_IRQ(ic);
 
        /* XXX merge multicast list into parent device */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
-       parent->set_multicast_list(ic->ic_dev);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+       parent->netdev_ops->ndo_set_rx_mode(ic->ic_dev);
 #else
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
        parent->netdev_ops->ndo_set_multicast_list(ic->ic_dev);
+#else
+       parent->set_multicast_list(ic->ic_dev);
+#endif
 #endif
 }