2008-10-31 21:50:14

by Andrey Yurovsky

[permalink] [raw]
Subject: [PATCH] mac80211: disable BSSID filtering for mesh interfaces

Mesh interfaces are currently opened with the FIF_ALLMULTI rx filter flag set,
however there is no BSSID in mesh so BSSID filtering should be disabled by
setting the FIF_OTHER_BSS flag as well. Also explicitly call
ieee80211_configure_filter for mesh.

Signed-off-by: Andrey Yurovsky <[email protected]>
Signed-off-by: Javier Cardona <[email protected]>
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index cde1452..6c3901a 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -229,8 +229,14 @@ static int ieee80211_open(struct net_device *dev)
if (res)
goto err_stop;

- if (ieee80211_vif_is_mesh(&sdata->vif))
+ if (ieee80211_vif_is_mesh(&sdata->vif)) {
+ local->fif_other_bss++;
+ netif_addr_lock_bh(local->mdev);
+ ieee80211_configure_filter(local);
+ netif_addr_unlock_bh(local->mdev);
+
ieee80211_start_mesh(sdata);
+ }
changed |= ieee80211_reset_erp_info(sdata);
ieee80211_bss_info_change_notify(sdata, changed);
ieee80211_enable_keys(sdata);
@@ -456,8 +462,15 @@ static int ieee80211_stop(struct net_device *dev)
/* fall through */
case NL80211_IFTYPE_MESH_POINT:
if (ieee80211_vif_is_mesh(&sdata->vif)) {
- /* allmulti is always set on mesh ifaces */
+ /* other_bss and allmulti are always set on mesh
+ * ifaces */
+ local->fif_other_bss--;
atomic_dec(&local->iff_allmultis);
+
+ netif_addr_lock_bh(local->mdev);
+ ieee80211_configure_filter(local);
+ netif_addr_unlock_bh(local->mdev);
+
ieee80211_stop_mesh(sdata);
}
/* fall through */




2008-10-31 21:54:31

by Johannes Berg

[permalink] [raw]
Subject: Re: [PATCH] mac80211: disable BSSID filtering for mesh interfaces

On Fri, 2008-10-31 at 14:50 -0700, Andrey Yurovsky wrote:
> Mesh interfaces are currently opened with the FIF_ALLMULTI rx filter flag set,
> however there is no BSSID in mesh so BSSID filtering should be disabled by
> setting the FIF_OTHER_BSS flag as well. Also explicitly call
> ieee80211_configure_filter for mesh.
>
> Signed-off-by: Andrey Yurovsky <[email protected]>
> Signed-off-by: Javier Cardona <[email protected]>

Acked-by: Johannes Berg <[email protected]>

> diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
> index cde1452..6c3901a 100644
> --- a/net/mac80211/iface.c
> +++ b/net/mac80211/iface.c
> @@ -229,8 +229,14 @@ static int ieee80211_open(struct net_device *dev)
> if (res)
> goto err_stop;
>
> - if (ieee80211_vif_is_mesh(&sdata->vif))
> + if (ieee80211_vif_is_mesh(&sdata->vif)) {
> + local->fif_other_bss++;
> + netif_addr_lock_bh(local->mdev);
> + ieee80211_configure_filter(local);
> + netif_addr_unlock_bh(local->mdev);
> +
> ieee80211_start_mesh(sdata);
> + }
> changed |= ieee80211_reset_erp_info(sdata);
> ieee80211_bss_info_change_notify(sdata, changed);
> ieee80211_enable_keys(sdata);
> @@ -456,8 +462,15 @@ static int ieee80211_stop(struct net_device *dev)
> /* fall through */
> case NL80211_IFTYPE_MESH_POINT:
> if (ieee80211_vif_is_mesh(&sdata->vif)) {
> - /* allmulti is always set on mesh ifaces */
> + /* other_bss and allmulti are always set on mesh
> + * ifaces */
> + local->fif_other_bss--;
> atomic_dec(&local->iff_allmultis);
> +
> + netif_addr_lock_bh(local->mdev);
> + ieee80211_configure_filter(local);
> + netif_addr_unlock_bh(local->mdev);
> +
> ieee80211_stop_mesh(sdata);
> }
> /* fall through */
>
>
>


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