madwifi: rename incorrectly named patch file (#7459)
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 13 Jun 2010 18:11:05 +0000 (18:11 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 13 Jun 2010 18:11:05 +0000 (18:11 +0000)
SVN-Revision: 21788

package/madwifi/patches/465-mc_list-2.6.35.pach [deleted file]
package/madwifi/patches/465-mc_list-2.6.35.patch [new file with mode: 0644]

diff --git a/package/madwifi/patches/465-mc_list-2.6.35.pach b/package/madwifi/patches/465-mc_list-2.6.35.pach
deleted file mode 100644 (file)
index 4931cfb..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/ath/if_ath.c
-+++ b/ath/if_ath.c
-@@ -4466,7 +4466,11 @@ ath_merge_mcast(struct ath_softc *sc, u_
- {
-       struct ieee80211com *ic = &sc->sc_ic;
-       struct ieee80211vap *vap;
-+      #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35) 
-+      struct netdev_hw_addr *ha; 
-+      #else
-       struct dev_mc_list *mc;
-+      #endif
-       u_int32_t val;
-       u_int8_t pos;
-@@ -4474,6 +4478,17 @@ ath_merge_mcast(struct ath_softc *sc, u_
-       /* XXX locking */
-       TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) {
-               struct net_device *dev = vap->iv_dev;
-+              #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
-+              netdev_for_each_mc_addr(ha, dev) { 
-+                      /* calculate XOR of eight 6-bit values */
-+                      val = LE_READ_4(ha->addr + 0);
-+                      pos = (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val;
-+                      val = LE_READ_4(ha->addr + 3);
-+                      pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val;
-+                      pos &= 0x3f;
-+                      mfilt[pos / 32] |= (1 << (pos % 32));
-+              }
-+              #else
-               for (mc = dev->mc_list; mc; mc = mc->next) {
-                       /* calculate XOR of eight 6-bit values */
-                       val = LE_READ_4(mc->dmi_addr + 0);
-@@ -4483,6 +4498,7 @@ ath_merge_mcast(struct ath_softc *sc, u_
-                       pos &= 0x3f;
-                       mfilt[pos / 32] |= (1 << (pos % 32));
-               }
-+              #endif 
-       }
- }
diff --git a/package/madwifi/patches/465-mc_list-2.6.35.patch b/package/madwifi/patches/465-mc_list-2.6.35.patch
new file mode 100644 (file)
index 0000000..4931cfb
--- /dev/null
@@ -0,0 +1,40 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -4466,7 +4466,11 @@ ath_merge_mcast(struct ath_softc *sc, u_
+ {
+       struct ieee80211com *ic = &sc->sc_ic;
+       struct ieee80211vap *vap;
++      #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35) 
++      struct netdev_hw_addr *ha; 
++      #else
+       struct dev_mc_list *mc;
++      #endif
+       u_int32_t val;
+       u_int8_t pos;
+@@ -4474,6 +4478,17 @@ ath_merge_mcast(struct ath_softc *sc, u_
+       /* XXX locking */
+       TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) {
+               struct net_device *dev = vap->iv_dev;
++              #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++              netdev_for_each_mc_addr(ha, dev) { 
++                      /* calculate XOR of eight 6-bit values */
++                      val = LE_READ_4(ha->addr + 0);
++                      pos = (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val;
++                      val = LE_READ_4(ha->addr + 3);
++                      pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val;
++                      pos &= 0x3f;
++                      mfilt[pos / 32] |= (1 << (pos % 32));
++              }
++              #else
+               for (mc = dev->mc_list; mc; mc = mc->next) {
+                       /* calculate XOR of eight 6-bit values */
+                       val = LE_READ_4(mc->dmi_addr + 0);
+@@ -4483,6 +4498,7 @@ ath_merge_mcast(struct ath_softc *sc, u_
+                       pos &= 0x3f;
+                       mfilt[pos / 32] |= (1 << (pos % 32));
+               }
++              #endif 
+       }
+ }