From 9c0821fc57b0671c8cb79e1068048a453f1fa504 Mon Sep 17 00:00:00 2001
From: Priit Laes <plaes@plaes.org>
Date: Sat, 1 Sep 2012 12:06:02 +0300
Subject: [PATCH] --- yaml --- r: 324777 b: refs/heads/master c:
 6d99c525a0a1e981d89cc8f42b721f5973e684dd h: refs/heads/master i:   324775:
 979ebc0dce2fc60a4abce35e2d45e86a4aecb181 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/staging/csr/netdev.c | 25 -------------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index c4f8e0b76a40..8c9c6eaf44a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99b2c9d77eaa1f9a52cad4432631c9e7a741ac6b
+refs/heads/master: 6d99c525a0a1e981d89cc8f42b721f5973e684dd
diff --git a/trunk/drivers/staging/csr/netdev.c b/trunk/drivers/staging/csr/netdev.c
index 371e0a0ea587..01ec08e15b16 100644
--- a/trunk/drivers/staging/csr/netdev.c
+++ b/trunk/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