generic: 5.15: fix wrong PACKET_MANGLE select in swconfig switch patch
authorChristian 'Ansuel' Marangi <ansuelsmth@gmail.com>
Sun, 5 Jun 2022 13:58:19 +0000 (15:58 +0200)
committerChristian 'Ansuel' Marangi <ansuelsmth@gmail.com>
Sun, 5 Jun 2022 14:58:33 +0000 (16:58 +0200)
In the rebase process of 5.15 hack patch the ETHERNET_PACKET_MANGLE got
wrongly swapped from AR8216_PHY to PSB6970_PHY.
Restore the ETHERNET_PACKET_MANGLE select to the right place.

Fixes: 1f302afd7350 ("generic: 5.15: rework hack patch")
Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
target/linux/generic/hack-5.15/700-swconfig_switch_drivers.patch

index 560937a7c16ec86eb8db7a822d8045b6e9984886..b90e1fc441b3ce1c23a3005de84312bbd3359441 100644 (file)
@@ -38,6 +38,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +config AR8216_PHY
 +      tristate "Driver for Atheros AR8216 switches"
 +      select SWCONFIG
++      select ETHERNET_PACKET_MANGLE
 +
 +config AR8216_PHY_LEDS
 +      bool "Atheros AR8216 switch LED support"
@@ -52,7 +53,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +config PSB6970_PHY
 +      tristate "Lantiq XWAY Tantos (PSB6970) Ethernet switch"
 +      select SWCONFIG
-+      select ETHERNET_PACKET_MANGLE
 +
 +config RTL8306_PHY
 +      tristate "Driver for Realtek RTL8306S switches"