[PATCH 06/14] staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.34
Signed-off-by: Priit Laes
---
drivers/staging/csr/netdev.c | 25 -
1 file changed, 25 deletions(-)
diff --git a/drivers/staging/csr/netdev.c b/drivers/staging/csr/netdev.c
index 52fd5ea..e41d516 100644
--- a/drivers/staging/csr/netdev.c
+++ b/drivers/staging/csr/netdev.c
@@ -2809,19 +2809,13 @@ uf_set_multicast_list(struct net_device *dev)
#else
u8 *mc_list = interfacePriv->mc_list;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,34)
struct netdev_hw_addr *mc_addr;
int mc_addr_count;
-#else
-struct dev_mc_list *p; /* Pointer to the addresses structure. */
-int i;
-#endif
if (priv->init_progress != UNIFI_INIT_COMPLETED) {
return;
}
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,34)
mc_addr_count = netdev_mc_count(dev);
unifi_trace(priv, UDBG3,
@@ -2840,25 +2834,6 @@ uf_set_multicast_list(struct net_device *dev)
mc_list += ETH_ALEN;
}
-#else
-unifi_trace(priv, UDBG3,
-"uf_set_multicast_list (count=%d)\n", dev->mc_count);
-
-/* Not enough space? */
-if (dev->mc_count > UNIFI_MAX_MULTICAST_ADDRESSES) {
-return;
-}
-
-/* Store the list to be processed by the work item. */
-interfacePriv->mc_list_count = dev->mc_count;
-p = dev->mc_list;
-for (i = 0; i < dev->mc_count; i++) {
-memcpy(mc_list, p->dmi_addr, ETH_ALEN);
-p = p->next;
-mc_list += ETH_ALEN;
-}
-#endif
-
/* Send a message to the workqueue */
queue_work(priv->unifi_workqueue, >multicast_list_task);
#endif
--
1.7.12
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 06/14] staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.34
Signed-off-by: Priit Laes pl...@plaes.org
---
drivers/staging/csr/netdev.c | 25 -
1 file changed, 25 deletions(-)
diff --git a/drivers/staging/csr/netdev.c b/drivers/staging/csr/netdev.c
index 52fd5ea..e41d516 100644
--- a/drivers/staging/csr/netdev.c
+++ b/drivers/staging/csr/netdev.c
@@ -2809,19 +2809,13 @@ uf_set_multicast_list(struct net_device *dev)
#else
u8 *mc_list = interfacePriv-mc_list;
-#if LINUX_VERSION_CODE KERNEL_VERSION(2,6,34)
struct netdev_hw_addr *mc_addr;
int mc_addr_count;
-#else
-struct dev_mc_list *p; /* Pointer to the addresses structure. */
-int i;
-#endif
if (priv-init_progress != UNIFI_INIT_COMPLETED) {
return;
}
-#if LINUX_VERSION_CODE KERNEL_VERSION(2,6,34)
mc_addr_count = netdev_mc_count(dev);
unifi_trace(priv, UDBG3,
@@ -2840,25 +2834,6 @@ uf_set_multicast_list(struct net_device *dev)
mc_list += ETH_ALEN;
}
-#else
-unifi_trace(priv, UDBG3,
-uf_set_multicast_list (count=%d)\n, dev-mc_count);
-
-/* Not enough space? */
-if (dev-mc_count UNIFI_MAX_MULTICAST_ADDRESSES) {
-return;
-}
-
-/* Store the list to be processed by the work item. */
-interfacePriv-mc_list_count = dev-mc_count;
-p = dev-mc_list;
-for (i = 0; i dev-mc_count; i++) {
-memcpy(mc_list, p-dmi_addr, ETH_ALEN);
-p = p-next;
-mc_list += ETH_ALEN;
-}
-#endif
-
/* Send a message to the workqueue */
queue_work(priv-unifi_workqueue, priv-multicast_list_task);
#endif
--
1.7.12
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
