diff options
| author | Priit Laes <plaes@plaes.org> | 2012-09-01 12:06:02 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-04 14:30:16 -0700 |
| commit | 6d99c525a0a1e981d89cc8f42b721f5973e684dd (patch) | |
| tree | 11e086d49d2684fcefb28fc2863f7ffd30cb705e | |
| parent | 99b2c9d77eaa1f9a52cad4432631c9e7a741ac6b (diff) | |
staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.34
Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/csr/netdev.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/staging/csr/netdev.c b/drivers/staging/csr/netdev.c index 371e0a0ea58..01ec08e15b1 100644 --- a/drivers/staging/csr/netdev.c +++ b/drivers/staging/csr/netdev.c @@ -2808,19 +2808,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, @@ -2839,25 +2833,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 |