From 98cc995c6f16acad3aeb536691623ce17b62755c Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Mon, 19 Mar 2012 18:55:17 -0700 Subject: [PATCH] compat-wireless: fix compilation of ath6kl on 2.6.34 This fixes compilation of compat-wireless completely on 2.6.34 Signed-off-by: Luis R. Rodriguez --- patches/25-multicast-list_head.patch | 38 ++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index 3dbb663b3cbc..91c1da69f598 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -780,3 +780,41 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 mutex_init(&local->iflist_mtx); mutex_init(&local->mtx); +--- a/drivers/net/wireless/ath/ath6kl/main.c ++++ b/drivers/net/wireless/ath/ath6kl/main.c +@@ -1119,7 +1119,11 @@ static void ath6kl_set_multicast_list(st + list_for_each_entry_safe(mc_filter, tmp, &vif->mc_filter, list) { + found = false; + netdev_for_each_mc_addr(ha, ndev) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + if (memcmp(ha->addr, mc_filter->hw_addr, ++#else ++ if (memcmp(ha->dmi_addr, mc_filter->hw_addr, ++#endif + ATH6KL_MCAST_FILTER_MAC_ADDR_SIZE) == 0) { + found = true; + break; +@@ -1153,7 +1157,11 @@ static void ath6kl_set_multicast_list(st + netdev_for_each_mc_addr(ha, ndev) { + found = false; + list_for_each_entry(mc_filter, &vif->mc_filter, list) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + if (memcmp(ha->addr, mc_filter->hw_addr, ++#else ++ if (memcmp(ha->dmi_addr, mc_filter->hw_addr, ++#endif + ATH6KL_MCAST_FILTER_MAC_ADDR_SIZE) == 0) { + found = true; + break; +@@ -1168,7 +1176,11 @@ static void ath6kl_set_multicast_list(st + goto out; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) + memcpy(mc_filter->hw_addr, ha->addr, ++#else ++ memcpy(mc_filter->hw_addr, ha->dmi_addr, ++#endif + ATH6KL_MCAST_FILTER_MAC_ADDR_SIZE); + /* Set the multicast filter */ + ath6kl_dbg(ATH6KL_DBG_TRC, -- 2.30.2