[Madwifi-cvs] revision 4175 committed

[Pavel R. <svn...@ma...>]

Project     : madwifi
Revision    : 4175
Author      : proski (Pavel Roskin)
Date        : 2011-11-22 18:22:34 +0100 (Tue, 22 Nov 2011)

Log Message :
Use ndo_set_rx_mode instead of ndo_set_multicast_list on Linux 3.2+

Affected Files:
* madwifi/trunk/ath/if_ath.c                          updated             
* madwifi/trunk/net80211/ieee80211.c                  updated             


Modified: madwifi/trunk/ath/if_ath.c
===================================================================
--- madwifi/trunk/ath/if_ath.c	2011-10-25 21:38:00 UTC (rev 4174)
+++ madwifi/trunk/ath/if_ath.c	2011-11-22 17:22:34 UTC (rev 4175)
@@ -511,7 +511,11 @@
 	.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,

Modified: madwifi/trunk/net80211/ieee80211.c
===================================================================
--- madwifi/trunk/net80211/ieee80211.c	2011-10-25 21:38:00 UTC (rev 4174)
+++ madwifi/trunk/net80211/ieee80211.c	2011-11-22 17:22:34 UTC (rev 4175)
@@ -411,7 +411,11 @@
 	.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
@@ -1806,11 +1810,15 @@
 	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
 }
 
 void