Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcf6bbfc authored by Maciej Żenczykowski's avatar Maciej Żenczykowski
Browse files

ANDROID: cuttlefish: enable CONFIG_NET_SCH_INGRESS=y 

This is to mirror:
  https://android-review.googlesource.com/c/kernel/configs/+/939600


  android-4.9+ for Q: require CONFIG_NET_SCH_INGRESS=y

Generated via:
  echo 'CONFIG_NET_SCH_INGRESS=y' >> arch/x86/configs/x86_64_cuttlefish_defconfig
  echo 'CONFIG_NET_SCH_INGRESS=y' >> arch/arm64/configs/cuttlefish_defconfig
  make ARCH=x86_64 x86_64_cuttlefish_defconfig
  make ARCH=x86_64 savedefconfig
  cat defconfig > arch/x86/configs/x86_64_cuttlefish_defconfig
  make ARCH=arm64 cuttlefish_defconfig
  make ARCH=arm64 savedefconfig
  cat defconfig > arch/arm64/configs/cuttlefish_defconfig
  rm defconfig

Bug: 65674744
Signed-off-by: default avatarMaciej Żenczykowski <maze@google.com>
Change-Id: I3ad4fb15e450392e527563208587b18b8285b3a8
parent 0b065cd5

arch/arm64/configs/cuttlefish_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -183,6 +183,7 @@ CONFIG_L2TP=y 
CONFIG_NET_SCHED=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_HTB=y

CONFIG_NET_SCH_HTB=y

CONFIG_NET_SCH_NETEM=y

CONFIG_NET_SCH_NETEM=y

CONFIG_NET_SCH_INGRESS=y

CONFIG_NET_CLS_U32=y

CONFIG_NET_CLS_U32=y

CONFIG_NET_CLS_BPF=y

CONFIG_NET_CLS_BPF=y

CONFIG_NET_EMATCH=y

CONFIG_NET_EMATCH=y

arch/x86/configs/x86_64_cuttlefish_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -189,6 +189,7 @@ CONFIG_IP6_NF_RAW=y 
CONFIG_NET_SCHED=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_HTB=y

CONFIG_NET_SCH_HTB=y

CONFIG_NET_SCH_NETEM=y

CONFIG_NET_SCH_NETEM=y

CONFIG_NET_SCH_INGRESS=y

CONFIG_NET_CLS_U32=y

CONFIG_NET_CLS_U32=y

CONFIG_NET_CLS_BPF=y

CONFIG_NET_CLS_BPF=y

CONFIG_NET_EMATCH=y

CONFIG_NET_EMATCH=y