Revert "CHROMIUM: config: disable CONFIG_USB_NET_RNDIS_WLAN and enable CONFIG_USB_USBNET"
This reverts commit efbb2e173e0ec8a669a0cd30c30dd28cf0487f5c.
Reason for revert: Security fix landed in crrev.com/c/4176232. Bring back the rndis_wlan.
Original change's description:
> CHROMIUM: config: disable CONFIG_USB_NET_RNDIS_WLAN and enable CONFIG_USB_USBNET
>
> Temporarily disable the CONFIG_USB_NET_RNDIS_WLAN config option until
> http://b/262448137 is resolved.
>
> CONFIG USB_USBNET is directly depended on by netboot, but is currently
> only selected by CONFIG_USB_NET_RNDIS_WLAN. Add CONFIG_USB_USBNET to
> base.config so we don't lose it when we drop rndis wlan. This is the
> problem encountered with Iadc1c59318b8566a3032a23c00929dcb7335d336,
> and it is fixed in this version. See $TEST for how I verified this.
>
> Steps:
> 1) `chromeos/scripts/kernelconfig olddefconfig` to make sure we have a
> clean config to start, which we did
> 2) Set CONFIG_USB_NET_RNDIS_WLAN=n and CONFIG_USB_USBNET=m
> in chromeos/config/base.config
> 3) `chromeos/scripts/kernelconfig olddefconfig` to re-normalize our
> configs. This disabled some other related CONFIG_USB_NET_*
> settings.
>
> BUG=b:262448137
> TEST=On ToT:
> `./make_netboot.sh --board=hatch`
> Builds successfully.
> TEST=With Iadc1c59318b8566a3032a23c00929dcb7335d336:
> `./make_netboot.sh --board=hatch`
> Fails with missing usbnet.
> TEST=With this change:
> `./make_netboot.sh --board=hatch`
> Builds successfully.
>
> Change-Id: I2a0ec1585e4515722abd00a1507c1f5cdc0e47a0
> Signed-off-by: Kevin Lund <kglund@google.com>
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/4119276
> Reviewed-by: Ross Zwisler <zwisler@google.com>
> Reviewed-by: Nicolas Norvez <norvez@chromium.org>
Bug: b:262448137
Change-Id: I6bb5960b2ab53e8b086e41661c693d31c87fac9a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/4181465
Reviewed-by: Ross Zwisler <zwisler@google.com>
Reviewed-by: Kevin Lund <kglund@google.com>
Tested-by: Jun Yu <junyuu@chromium.org>
Commit-Queue: Ross Zwisler <zwisler@google.com>
1 file changed
