2007-10-12 20:49:13

by Michael Wu

[permalink] [raw]
Subject: [PATCH] rtl8187: remove NICMAC setting in configure_filters callback

From: Michael Wu <[email protected]>

NICMAC should always be set.

Signed-off-by: Michael Wu <[email protected]>
---

drivers/net/wireless/rtl8187_dev.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c
index 643919a..590f4b4 100644
--- a/drivers/net/wireless/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl8187_dev.c
@@ -588,8 +588,6 @@ static void rtl8187_configure_filter(struct ieee80211_hw *dev,

*total_flags = 0;

- if (changed_flags & FIF_PROMISC_IN_BSS)
- priv->rx_conf ^= RTL818X_RX_CONF_NICMAC;
if (changed_flags & FIF_ALLMULTI)
priv->rx_conf ^= RTL818X_RX_CONF_MULTICAST;
if (changed_flags & FIF_FCSFAIL)
@@ -602,8 +600,6 @@ static void rtl8187_configure_filter(struct ieee80211_hw *dev,
if (mc_count > 0)
priv->rx_conf |= RTL818X_RX_CONF_MULTICAST;

- if (priv->rx_conf & RTL818X_RX_CONF_NICMAC)
- *total_flags |= FIF_PROMISC_IN_BSS;
if (priv->rx_conf & RTL818X_RX_CONF_MULTICAST)
*total_flags |= FIF_ALLMULTI;
if (priv->rx_conf & RTL818X_RX_CONF_FCS)



2007-10-12 21:02:32

by Michael Wu

[permalink] [raw]
Subject: Re: [PATCH] rtl8187: remove NICMAC setting in configure_filters callback

On Friday 12 October 2007 16:53, Johannes Berg wrote:
> Does this mean you're always operating promiscuously, or was this a bug?
Just a bug.

> If the latter, do you not support promisc at all? Or should the FIF flag
> always be set?
I think it can be done by a different bit, but I need to check.

-Michael Wu


Attachments:
(No filename) (311.00 B)
(No filename) (189.00 B)
Download all attachments

2007-10-12 20:53:31

by Johannes Berg

[permalink] [raw]
Subject: Re: [PATCH] rtl8187: remove NICMAC setting in configure_filters callback

On Fri, 2007-10-12 at 16:45 -0400, Michael Wu wrote:
> @@ -602,8 +600,6 @@ static void rtl8187_configure_filter(struct ieee80211_hw *dev,
> if (mc_count > 0)
> priv->rx_conf |= RTL818X_RX_CONF_MULTICAST;
>
> - if (priv->rx_conf & RTL818X_RX_CONF_NICMAC)
> - *total_flags |= FIF_PROMISC_IN_BSS;

Does this mean you're always operating promiscuously, or was this a bug?
If the latter, do you not support promisc at all? Or should the FIF flag
always be set?

johannes


Attachments:
signature.asc (828.00 B)
This is a digitally signed message part