]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
rt2x00: error in configurations with mesh support disabled
authorFelix Fietkau <nbd@openwrt.org>
Tue, 26 Feb 2013 15:09:55 +0000 (16:09 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 10 Apr 2013 02:20:08 +0000 (03:20 +0100)
commit6a2c19ca2210f3f3eef99eeca550acd06e54c0c0
treeb08d54eaf2d499b7c378e0715ae7cacad4f47f71
parent8ebfe28181b02766ac41d9d841801c146e6161c1
rt2x00: error in configurations with  mesh support disabled

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.

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>
[lxiang: Backported for 3.4-stable. Removed code of simultaneous AP and mesh
 mode added in 4a5fc6d 3.9-rc1.]
Signed-off-by: Lingzhu Xiang <lxiang@redhat.com>
Reviewed-by: CAI Qian <caiqian@redhat.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/net/wireless/rt2x00/rt2x00dev.c