lkml.org 
[lkml]   [2013]   [Mar]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 98/98] rt2x00: error in configurations with mesh support disabled
    Date
    3.8-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Felix Fietkau <nbd@openwrt.org>

    commit 6ef9e2f6d12ce9e2120916804d2ddd46b954a70b upstream.

    If CONFIG_MAC80211_MESH is not set, cfg80211 will now allow advertising
    interface combinations with NL80211_IFTYPE_MESH_POINT present.
    Add appropriate ifdefs to avoid running into errors.

    [Backported for 3.8-stable. Removed code of simultaneous AP and mesh
    mode added in 4a5fc6d 3.9-rc1.]

    Signed-off-by: Felix Fietkau <nbd@openwrt.org>
    Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Lingzhu Xiang <lxiang@redhat.com>
    Reviewed-by: CAI Qian <caiqian@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/wireless/rt2x00/rt2x00dev.c | 2 ++
    1 file changed, 2 insertions(+)

    --- a/drivers/net/wireless/rt2x00/rt2x00dev.c
    +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
    @@ -1209,7 +1209,9 @@ int rt2x00lib_probe_dev(struct rt2x00_de
    rt2x00dev->hw->wiphy->interface_modes |=
    BIT(NL80211_IFTYPE_ADHOC) |
    BIT(NL80211_IFTYPE_AP) |
    +#ifdef CONFIG_MAC80211_MESH
    BIT(NL80211_IFTYPE_MESH_POINT) |
    +#endif
    BIT(NL80211_IFTYPE_WDS);

    rt2x00dev->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;



    \
     
     \ /
      Last update: 2013-03-27 00:21    [W:4.120 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site