source: trunk/package/mac80211/patches/300-fix-mesh.patch @ 20585

Last change on this file since 20585 was 20585, checked in by hauke, 6 years ago

mac80211: fix mesh.

This fixes #6774

File size: 1.3 KB
  • net/mac80211/mesh.c

    From 181ce6f71d907f42ab73376ce154015a835a6d8a Mon Sep 17 00:00:00 2001
    From: Javier Cardona <javier@cozybit.com>
    Date: Mon, 29 Mar 2010 11:00:20 -0700
    Subject: [PATCH] mac80211: Handle mesh action frames in ieee80211_rx_h_action
    
    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>
    Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
    ---
     net/mac80211/mesh.c |    3 ---
     net/mac80211/rx.c   |    5 +++++
     2 files changed, 5 insertions(+), 3 deletions(-)
    
    a b ieee80211_mesh_rx_mgmt(struct ieee80211_ 
    749749 
    750750        switch (fc & IEEE80211_FCTL_STYPE) { 
    751751        case IEEE80211_STYPE_ACTION: 
    752                 if (skb->len < IEEE80211_MIN_ACTION_SIZE) 
    753                         return RX_DROP_MONITOR; 
    754                 /* fall through */ 
    755752        case IEEE80211_STYPE_PROBE_RESP: 
    756753        case IEEE80211_STYPE_BEACON: 
    757754                skb_queue_tail(&ifmsh->skb_queue, skb); 
  • net/mac80211/rx.c

    a b ieee80211_rx_h_action(struct ieee80211_r 
    19641964                        goto handled; 
    19651965                } 
    19661966                break; 
     1967        case MESH_PLINK_CATEGORY: 
     1968        case MESH_PATH_SEL_CATEGORY: 
     1969                if (ieee80211_vif_is_mesh(&sdata->vif)) 
     1970                        return ieee80211_mesh_rx_mgmt(sdata, rx->skb); 
     1971                break; 
    19671972        } 
    19681973 
    19691974        /* 
Note: See TracBrowser for help on using the repository browser.