From patchwork Mon Mar 29 18:00:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Cardona X-Patchwork-Id: 89042 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2TI0cQq019932 for ; Mon, 29 Mar 2010 18:00:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753958Ab0C2SAh (ORCPT ); Mon, 29 Mar 2010 14:00:37 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:36941 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752696Ab0C2SAg (ORCPT ); Mon, 29 Mar 2010 14:00:36 -0400 Received: by pwi5 with SMTP id 5so6836309pwi.19 for ; Mon, 29 Mar 2010 11:00:35 -0700 (PDT) Received: by 10.141.100.16 with SMTP id c16mr4850755rvm.77.1269885635530; Mon, 29 Mar 2010 11:00:35 -0700 (PDT) Received: from localhost.localdomain (adsl-71-156-104-53.dsl.pltn13.sbcglobal.net [71.156.104.53]) by mx.google.com with ESMTPS id b2sm1463728rvn.18.2010.03.29.11.00.33 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 29 Mar 2010 11:00:34 -0700 (PDT) From: Javier Cardona To: linux-wireless@vger.kernel.org Cc: Javier Cardona , Steve Derosier , devel@lists.open80211s.org Subject: [PATCH 1/2 v3] mac80211: Handle mesh action frames in ieee80211_rx_h_action Date: Mon, 29 Mar 2010 11:00:20 -0700 Message-Id: <1269885621-10257-1-git-send-email-javier@cozybit.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1269844239.4131.3.camel@jlt3.sipsolutions.net> References: <1269844239.4131.3.camel@jlt3.sipsolutions.net> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 29 Mar 2010 18:00:38 +0000 (UTC) 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; } /*