Skip to content

Commit

Permalink
staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.34
Browse files Browse the repository at this point in the history
Signed-off-by: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Priit Laes authored and Greg Kroah-Hartman committed Sep 4, 2012
1 parent 99b2c9d commit 6d99c52
Showing 1 changed file with 0 additions and 25 deletions.
25 changes: 0 additions & 25 deletions drivers/staging/csr/netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down

0 comments on commit 6d99c52

Please sign in to comment.