From: Johannes Berg <johannes@sipsolutions.net>
To: Javier Cardona <javier@cozybit.com>
Cc: linux-wireless@vger.kernel.org,
Steve Derosier <steve@cozybit.com>,
devel@lists.open80211s.org
Subject: Re: [PATCH 1/2 v3] mac80211: Handle mesh action frames in ieee80211_rx_h_action
Date: Wed, 31 Mar 2010 18:37:41 +0200 [thread overview]
Message-ID: <1270053461.16210.40.camel@jlt3.sipsolutions.net> (raw)
In-Reply-To: <1269885621-10257-1-git-send-email-javier@cozybit.com>
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@cozybit.com>
Cc: stable@kernel.org
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
> ---
> 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;
> }
>
> /*
prev parent reply other threads:[~2010-03-31 16:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <368d7bd403c196b9e3a306eb7863a621@localhost>
[not found] ` <1269653791-28478-1-git-send-email-javier@cozybit.com>
2010-03-29 6:30 ` [PATCH v2] mac80211: Handle mesh action frames in ieee80211_rx_h_action Johannes Berg
2010-03-29 18:00 ` [PATCH 1/2 v3] " Javier Cardona
2010-03-29 18:00 ` [PATCH 2/2] mac80211: Moved mesh action codes to a more visible location Javier Cardona
2010-03-31 16:38 ` Johannes Berg
2010-03-31 16:37 ` Johannes Berg [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1270053461.16210.40.camel@jlt3.sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=devel@lists.open80211s.org \
--cc=javier@cozybit.com \
--cc=linux-wireless@vger.kernel.org \
--cc=steve@cozybit.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).