projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: allow configure_filter callback to sleep
[deliverable/linux.git]
/
drivers
/
net
/
wireless
/
rtl818x
/
rtl8180_dev.c
diff --git
a/drivers/net/wireless/rtl818x/rtl8180_dev.c
b/drivers/net/wireless/rtl818x/rtl8180_dev.c
index 09f46abc730a97274fcf167f045012cdcc4e62fa..16429c49139c2da3953a6d5fef836f2f093b1443 100644
(file)
--- a/
drivers/net/wireless/rtl818x/rtl8180_dev.c
+++ b/
drivers/net/wireless/rtl818x/rtl8180_dev.c
@@
-728,10
+728,16
@@
static void rtl8180_bss_info_changed(struct ieee80211_hw *dev,
priv->rf->conf_erp(dev, info);
}
priv->rf->conf_erp(dev, info);
}
+static u64 rtl8180_prepare_multicast(struct ieee80211_hw *dev, int mc_count,
+ struct dev_addr_list *mc_list)
+{
+ return mc_count;
+}
+
static void rtl8180_configure_filter(struct ieee80211_hw *dev,
unsigned int changed_flags,
unsigned int *total_flags,
static void rtl8180_configure_filter(struct ieee80211_hw *dev,
unsigned int changed_flags,
unsigned int *total_flags,
-
int mc_count, struct dev_addr_list *mcli
st)
+
u64 multica
st)
{
struct rtl8180_priv *priv = dev->priv;
{
struct rtl8180_priv *priv = dev->priv;
@@
-741,7
+747,7
@@
static void rtl8180_configure_filter(struct ieee80211_hw *dev,
priv->rx_conf ^= RTL818X_RX_CONF_CTRL;
if (changed_flags & FIF_OTHER_BSS)
priv->rx_conf ^= RTL818X_RX_CONF_MONITOR;
priv->rx_conf ^= RTL818X_RX_CONF_CTRL;
if (changed_flags & FIF_OTHER_BSS)
priv->rx_conf ^= RTL818X_RX_CONF_MONITOR;
- if (*total_flags & FIF_ALLMULTI || m
c_coun
t > 0)
+ if (*total_flags & FIF_ALLMULTI || m
ulticas
t > 0)
priv->rx_conf |= RTL818X_RX_CONF_MULTICAST;
else
priv->rx_conf &= ~RTL818X_RX_CONF_MULTICAST;
priv->rx_conf |= RTL818X_RX_CONF_MULTICAST;
else
priv->rx_conf &= ~RTL818X_RX_CONF_MULTICAST;
@@
-768,6
+774,7
@@
static const struct ieee80211_ops rtl8180_ops = {
.remove_interface = rtl8180_remove_interface,
.config = rtl8180_config,
.bss_info_changed = rtl8180_bss_info_changed,
.remove_interface = rtl8180_remove_interface,
.config = rtl8180_config,
.bss_info_changed = rtl8180_bss_info_changed,
+ .prepare_multicast = rtl8180_prepare_multicast,
.configure_filter = rtl8180_configure_filter,
};
.configure_filter = rtl8180_configure_filter,
};
This page took
0.025979 seconds
and
5
git commands to generate.