On Tue, 2013-03-19 at 13:06 +0800, Lingzhu Xiang wrote: > commit 6ef9e2f6d12ce9e2120916804d2ddd46b954a70b upstream. > > Backported for 3.4-stable. Removed code of simultaneous AP and mesh > mode added in 4a5fc6d 3.9-rc1. > > From: Felix Fietkau <nbd@xxxxxxxxxxx> > > 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. > > Cc: stable@xxxxxxxxxxxxxxx > Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx> > Acked-by: Gertjan van Wingerde <gwingerde@xxxxxxxxx> > Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx> > Signed-off-by: Lingzhu Xiang <lxiang@xxxxxxxxxx> > Reviewed-by: CAI Qian <caiqian@xxxxxxxxxx> I've queued this up for 3.2.y as well. Ben. > diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c > index 12b1ff5..866fd56 100644 > --- a/drivers/net/wireless/rt2x00/rt2x00dev.c > +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c > @@ -1157,7 +1157,9 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) > 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); > > /* -- Ben Hutchings I'm not a reverse psychological virus. Please don't copy me into your sig.
Attachment:
signature.asc
Description: This is a digitally signed message part