diff options
| author | David S. Miller | 2018-10-04 06:00:17 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-10-04 06:00:17 +0200 |
| commit | 6f41617bf23a17d9cb7cc6ca8161534f05f80293 (patch) | |
| tree | 2844d8d197a61b0603e31f09613e3272635dd1cc /net/wireless/reg.c | |
| parent | Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe... (diff) | |
| parent | Merge gitolite.kernel.org:/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-6f41617bf23a17d9cb7cc6ca8161534f05f80293.tar.gz kernel-qcow2-linux-6f41617bf23a17d9cb7cc6ca8161534f05f80293.tar.xz kernel-qcow2-linux-6f41617bf23a17d9cb7cc6ca8161534f05f80293.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor conflict in net/core/rtnetlink.c, David Ahern's bug fix in 'net'
overlapped the renaming of a netlink attribute in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/reg.c')
| -rw-r--r-- | net/wireless/reg.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 56be68a27bb9..5ad5b9f98e8f 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -2873,6 +2873,7 @@ static int regulatory_hint_core(const char *alpha2) request->alpha2[0] = alpha2[0]; request->alpha2[1] = alpha2[1]; request->initiator = NL80211_REGDOM_SET_BY_CORE; + request->wiphy_idx = WIPHY_IDX_INVALID; queue_regulatory_request(request); |