mac80211: enable HT overrides for ibss
authorSimon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de>
Fri, 28 Jun 2013 08:39:59 +0000 (10:39 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 16 Jul 2013 06:57:57 +0000 (09:57 +0300)
Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Mathias Kretschmer <mathias.kretschmer@fokus.fraunhofer.de>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
net/mac80211/ht.c
net/mac80211/ibss.c
net/mac80211/ieee80211_i.h

Simple merge
Simple merge
Simple merge