On Mon, 2010-03-29 at 11:00 -0700, Javier Cardona wrote:
> This fixes the problem introduced in commit
> 8404080568613d93ad7cf0a16dfb68 which broke mesh peer link establishment.
>
> changes:
> v2 Added missing break (Johannes)
> v3 Broke original patch into two (Johannes)
>
> Signed-off-by: Javier Cardona <javier@xxxxxxxxxxx>
Cc: stable@xxxxxxxxxx
Reviewed-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
> ---
> net/mac80211/mesh.c | 3 ---
> net/mac80211/rx.c | 5 +++++
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
> index 61080c5..7a6bebc 100644
> --- a/net/mac80211/mesh.c
> +++ b/net/mac80211/mesh.c
> @@ -749,9 +749,6 @@ ieee80211_mesh_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb)
>
> switch (fc & IEEE80211_FCTL_STYPE) {
> case IEEE80211_STYPE_ACTION:
> - if (skb->len < IEEE80211_MIN_ACTION_SIZE)
> - return RX_DROP_MONITOR;
> - /* fall through */
> case IEEE80211_STYPE_PROBE_RESP:
> case IEEE80211_STYPE_BEACON:
> skb_queue_tail(&ifmsh->skb_queue, skb);
> diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
> index 1da57c8..1e03972 100644
> --- a/net/mac80211/rx.c
> +++ b/net/mac80211/rx.c
> @@ -1964,6 +1964,11 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
> goto handled;
> }
> break;
> + case MESH_PLINK_CATEGORY:
> + case MESH_PATH_SEL_CATEGORY:
> + if (ieee80211_vif_is_mesh(&sdata->vif))
> + return ieee80211_mesh_rx_mgmt(sdata, rx->skb);
> + break;
> }
>
> /*
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
