init: Get rid of load_cfg80211
network-services.conf auto-loads cfg80211 before shill starts. This is a
problem for Chrome OS, as we introduce iwl7000_cfg80211 on Intel
platforms. Now we have two copies of cfg80211, and the wrong one gets loaded
first. This leads to a kernel warning when iwlwifi tries to load
iwl700_cfg80211:
mnt/host/source/src/third_party/kernel/v4.4/fs/sysfs/dir.c:31 sysfs_warn_dup+0x64/0x73()
2018-01-17T16:48:51.055515-08:00 WARNING kernel: [ 46.896091] sysfs: cannot create duplicate filename '/class/ieee80211'
2018-01-17T16:48:51.058117-08:00 WARNING kernel: [ 46.896097] Modules linked in: iwl7000_cfg80211(+) rfcomm uinput zram [snipped]
2018-01-17T16:48:51.058156-08:00 WARNING kernel: [ 46.899200] CPU: 1 PID: 3066 Comm: modprobe Tainted: G U 4.4.70 #2
2018-01-17T16:48:51.058160-08:00 WARNING kernel: [ 46.899211] Hardware name: Google Reef/Reef, BIOS Google_Reef.9042.59.0 02/27/2017
2018-01-17T16:48:51.058162-08:00 WARNING kernel: [ 46.899219] 0000000000000286 00000000f738afb5 ffff88026e9dbb68 ffffffffaacf350a
2018-01-17T16:48:51.058165-08:00 WARNING kernel: [ 46.899237] ffff88026e9dbbb0 0000000000000009 ffff88026e9dbba0 ffffffffaaa6bdee
2018-01-17T16:48:51.058167-08:00 WARNING kernel: [ 46.899252] ffffffffaabed7e8 ffff88026e8e6000 ffff88024acc6890 ffff8802768a5618
2018-01-17T16:48:51.058170-08:00 WARNING kernel: [ 46.899268] Call Trace:
2018-01-17T16:48:51.058172-08:00 WARNING kernel: [ 46.899288] [<ffffffffaacf350a>] dump_stack+0x4d/0x63
network-services was added to autoload cfg80211 in CL:47829, and since
kernels after v3.3 already take care of loading cfg80211, it is redundant.
Thanks to Brian Norris for digging up commit afa8430953302
"genetlink: add auto module loading".
It is helpful to keep network-services around as it services as a
generic checkpoint for (interface-agnostic) network status at boot.
With load_cfg80211 removed, network-services doesn't need any
transformations before the ebuild installs it into the rootfs, so get
rid of the .in suffix.
CQ-DEPEND=CL:890079
BUG=b:68778576, chromium:782368
TEST=(a) Built with this change and Core31 on meowth 4.14 kernel, checked
that wifi comes up correctly without the kernel warning above, and
lsmod shows iwl7000_cfg80211, iwl7000_mac80211 and iwlwifi loaded.
(b) Tests on VM (betty) without wifi USE flag enabled
(c) Tests on 3.18, 3.14 and 4.4 kernel-based devices
Change-Id: I7f80886a99f33fd9fdbcd6bf069401eb20aed0fb
Reviewed-on: https://chromium-review.googlesource.com/890221
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
(cherry picked from commit 6455013e3b0038a35473756687cf2348b5c77c33)
2 files changed