OSDN Git Service

mac80211_hwsim: fix overwriting of if_combination
authorJames Prestwood <james.prestwood@linux.intel.com>
Wed, 12 Dec 2018 00:52:14 +0000 (16:52 -0800)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 18 Dec 2018 12:13:32 +0000 (13:13 +0100)
commit68406a9807e4db562a157df9a958b3b6e2cedb38
tree769871320740a2eed7a2a2f1ae2a124a0acd8aec
parentf6c7f03f69f7422bc237bc79599e152d390b74e0
mac80211_hwsim: fix overwriting of if_combination

Moved setting if_combination.num_different_channels/radar_detect_widths
into an else after use_chanctx. In the case of use_chanctx, these two
settings were getting overwritten.

Signed-off-by: James Prestwood <james.prestwood@linux.intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/mac80211_hwsim.c