diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /net/wireless/chan.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'net/wireless/chan.c')
| -rw-r--r-- | net/wireless/chan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/chan.c b/net/wireless/chan.c index b0e11b6dc994..0f506220a3bd 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c | |||
| @@ -513,6 +513,7 @@ static bool cfg80211_chandef_dfs_available(struct wiphy *wiphy, | |||
| 513 | r = cfg80211_get_chans_dfs_available(wiphy, | 513 | r = cfg80211_get_chans_dfs_available(wiphy, |
| 514 | chandef->center_freq2, | 514 | chandef->center_freq2, |
| 515 | width); | 515 | width); |
| 516 | break; | ||
| 516 | default: | 517 | default: |
| 517 | WARN_ON(chandef->center_freq2); | 518 | WARN_ON(chandef->center_freq2); |
| 518 | break; | 519 | break; |