package/mac80211/patches/300-fix-mesh.patch

   1 From 181ce6f71d907f42ab73376ce154015a835a6d8a Mon Sep 17 00:00:00 2001
   2 From: Javier Cardona <javier@cozybit.com>
   3 Date: Mon, 29 Mar 2010 11:00:20 -0700
   4 Subject: [PATCH] mac80211: Handle mesh action frames in ieee80211_rx_h_action
   5
   6 This fixes the problem introduced in commit
   7 8404080568613d93ad7cf0a16dfb68 which broke mesh peer link establishment.
   8
   9 changes:
  10 v2      Added missing break (Johannes)
  11 v3      Broke original patch into two (Johannes)
  12
  13 Signed-off-by: Javier Cardona <javier@cozybit.com>
  14 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  15 ---
  16  net/mac80211/mesh.c |    3 ---
  17  net/mac80211/rx.c   |    5 +++++
  18  2 files changed, 5 insertions(+), 3 deletions(-)
  19
  20 --- a/net/mac80211/mesh.c
  21 +++ b/net/mac80211/mesh.c
  22 @@ -749,9 +749,6 @@ ieee80211_mesh_rx_mgmt(struct ieee80211_
  23
  24         switch (fc & IEEE80211_FCTL_STYPE) {
  25         case IEEE80211_STYPE_ACTION:
  26 -               if (skb->len < IEEE80211_MIN_ACTION_SIZE)
  27 -                       return RX_DROP_MONITOR;
  28 -               /* fall through */
  29         case IEEE80211_STYPE_PROBE_RESP:
  30         case IEEE80211_STYPE_BEACON:
  31                 skb_queue_tail(&ifmsh->skb_queue, skb);
  32 --- a/net/mac80211/rx.c
  33 +++ b/net/mac80211/rx.c
  34 @@ -1964,6 +1964,11 @@ ieee80211_rx_h_action(struct ieee80211_r
  35                         goto handled;
  36                 }
  37                 break;
  38 +       case MESH_PLINK_CATEGORY:
  39 +       case MESH_PATH_SEL_CATEGORY:
  40 +               if (ieee80211_vif_is_mesh(&sdata->vif))
  41 +                       return ieee80211_mesh_rx_mgmt(sdata, rx->skb);
  42 +               break;
  43         }
  44
  45         /*