The patch titled w35und: remove unused code from wbsoft_configure_filter() has been removed from the -mm tree. Its filename was w35und-remove-unused-code-from-wbsoft_configure_filter.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: w35und: remove unused code from wbsoft_configure_filter() From: Pekka Enberg <penberg@xxxxxxxxxxxxxx> We don't initialize hardware multicast filter in the driver nor do we know how to do that. Therefore, remove some code that isn't actually used from wbsoft_configure_filter(). Cc: Pavel Machek <pavel@xxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/staging/winbond/wbusb.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff -puN drivers/staging/winbond/wbusb.c~w35und-remove-unused-code-from-wbsoft_configure_filter drivers/staging/winbond/wbusb.c --- a/drivers/staging/winbond/wbusb.c~w35und-remove-unused-code-from-wbsoft_configure_filter +++ a/drivers/staging/winbond/wbusb.c @@ -83,32 +83,14 @@ static void wbsoft_configure_filter(stru unsigned int *total_flags, int mc_count, struct dev_mc_list *mclist) { - unsigned int bit_nr, new_flags; - u32 mc_filter[2]; - int i; + unsigned int new_flags; new_flags = 0; - if (*total_flags & FIF_PROMISC_IN_BSS) { + if (*total_flags & FIF_PROMISC_IN_BSS) new_flags |= FIF_PROMISC_IN_BSS; - mc_filter[1] = mc_filter[0] = ~0; - } else if ((*total_flags & FIF_ALLMULTI) || (mc_count > 32)) { + else if ((*total_flags & FIF_ALLMULTI) || (mc_count > 32)) new_flags |= FIF_ALLMULTI; - mc_filter[1] = mc_filter[0] = ~0; - } else { - mc_filter[1] = mc_filter[0] = 0; - for (i = 0; i < mc_count; i++) { - if (!mclist) - break; - printk("Should call ether_crc here\n"); - //bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; - bit_nr = 0; - - bit_nr &= 0x3F; - mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); - mclist = mclist->next; - } - } dev->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS; _ Patches currently in -mm which might be from penberg@xxxxxxxxxxxxxx are repeatable-slab-corruption-with-ltp-msgctl08.patch linux-next.patch cpusets-restructure-the-function-cpuset_update_task_memory_state.patch cpusets-update-tasks-page-slab-spread-flags-in-time.patch cpusetmm-update-tasks-mems_allowed-in-time.patch slab-leaks3-default-y.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html