aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2009-03-27 13:46:45 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-19 14:00:37 -0400
commit6ab32127205adf6c16942fdc2e3ee10f2b20bce5 (patch)
tree1eb627954a02792a4c72b0b3c17a2e2ff4ca7abe /drivers
parent290d4c23506545633878132860cc7d4fac0da23e (diff)
Staging: w35und: remove unused code from wbsoft_configure_filter()
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@ucw.cz> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/winbond/wbusb.c24
1 files changed, 3 insertions, 21 deletions
diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c
index 3b2d52819b4..cf176bd3f66 100644
--- a/drivers/staging/winbond/wbusb.c
+++ b/drivers/staging/winbond/wbusb.c
@@ -83,32 +83,14 @@ static void wbsoft_configure_filter(struct ieee80211_hw *dev,
83 unsigned int *total_flags, 83 unsigned int *total_flags,
84 int mc_count, struct dev_mc_list *mclist) 84 int mc_count, struct dev_mc_list *mclist)
85{ 85{
86 unsigned int bit_nr, new_flags; 86 unsigned int new_flags;
87 u32 mc_filter[2];
88 int i;
89 87
90 new_flags = 0; 88 new_flags = 0;
91 89
92 if (*total_flags & FIF_PROMISC_IN_BSS) { 90 if (*total_flags & FIF_PROMISC_IN_BSS)
93 new_flags |= FIF_PROMISC_IN_BSS; 91 new_flags |= FIF_PROMISC_IN_BSS;
94 mc_filter[1] = mc_filter[0] = ~0; 92 else if ((*total_flags & FIF_ALLMULTI) || (mc_count > 32))
95 } else if ((*total_flags & FIF_ALLMULTI) || (mc_count > 32)) {
96 new_flags |= FIF_ALLMULTI; 93 new_flags |= FIF_ALLMULTI;
97 mc_filter[1] = mc_filter[0] = ~0;
98 } else {
99 mc_filter[1] = mc_filter[0] = 0;
100 for (i = 0; i < mc_count; i++) {
101 if (!mclist)
102 break;
103 printk("Should call ether_crc here\n");
104 //bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
105 bit_nr = 0;
106
107 bit_nr &= 0x3F;
108 mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
109 mclist = mclist->next;
110 }
111 }
112 94
113 dev->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS; 95 dev->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS;
114 96