diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-09-18 09:44:50 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-18 09:44:49 -0700 |
| commit | 79d712a8a438a356ace70baea3471774f8bc070f (patch) | |
| tree | 4d55ae5bb7abf530c2cd0e275ba061f7752395a3 | |
| parent | da56125cdc44c166968a493f12a47b9eb3a6ee98 (diff) | |
| parent | 30f7e5cd6cc7e8ea0926c2c16969c1c165876d55 (diff) | |
Merge "defconfig: Disable CONFIG_INET_LRO to avoid pop up"
| -rw-r--r-- | arch/arm64/configs/sdm660-perf_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/sdm660_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/sdm660-perf_defconfig b/arch/arm64/configs/sdm660-perf_defconfig index b314ef047386..f792baff7bb7 100644 --- a/arch/arm64/configs/sdm660-perf_defconfig +++ b/arch/arm64/configs/sdm660-perf_defconfig @@ -106,6 +106,7 @@ CONFIG_NET_IPVTI=y CONFIG_INET_AH=y CONFIG_INET_ESP=y CONFIG_INET_IPCOMP=y +# CONFIG_INET_LRO is not set CONFIG_INET_UDP_DIAG=y CONFIG_INET_DIAG_DESTROY=y CONFIG_IPV6_ROUTER_PREF=y diff --git a/arch/arm64/configs/sdm660_defconfig b/arch/arm64/configs/sdm660_defconfig index 5e47428bbd5c..6c6f56ed52f3 100644 --- a/arch/arm64/configs/sdm660_defconfig +++ b/arch/arm64/configs/sdm660_defconfig @@ -106,6 +106,7 @@ CONFIG_NET_IPVTI=y CONFIG_INET_AH=y CONFIG_INET_ESP=y CONFIG_INET_IPCOMP=y +# CONFIG_INET_LRO is not set CONFIG_INET_UDP_DIAG=y CONFIG_INET_DIAG_DESTROY=y CONFIG_IPV6_ROUTER_PREF=y |