From 84568a8889d42621cea2de51c4b24060cd8cb1d8 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Tue, 27 Sep 2016 13:45:03 -0600
Subject: [PATCH] UBUNTU: [Config] CONFIG_NET_SWITCHDEV=y for amd64/arm64

BugLink: http://bugs.launchpad.net/bugs/1628241

It is possible NET_SWITCHDEV may be required for armhf, but
leave it off until we know for sure.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 debian.master/config/amd64/config.common.amd64 |  2 +-
 debian.master/config/annotations               |  3 ++-
 debian.master/config/arm64/config.common.arm64 |  2 +-
 debian.master/config/config.common.ubuntu      | 14 ++++++++++++++
 debian.master/config/s390x/config.common.s390x |  2 +-
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 16f8892077a6..3c58d397dec7 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -367,7 +367,7 @@ CONFIG_NET_CADENCE=y
 # CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_NET_MPLS_GSO=m
 CONFIG_NET_PACKET_ENGINE=y
-# CONFIG_NET_SWITCHDEV is not set
+CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_TCPPROBE=m
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_NET_VENDOR_ADAPTEC=y
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 3cfd2d8e3ffc..0c30ab395967 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -8907,9 +8907,10 @@ CONFIG_INET_DIAG                                policy<{'amd64': 'm', 'arm64': '
 CONFIG_INET_UDP_DIAG                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_TCP_MD5SIG                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_NETLABEL                                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_NET_SWITCHDEV                            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
+CONFIG_NET_SWITCHDEV                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 #
 CONFIG_SYN_COOKIES                              mark<ENFORCED>
+CONFIG_NET_SWITCHDEV				mark<ENFORCED> note<LP: #1628241>
 
 # Menu: Networking support >> Networking options >> TCP/IP networking >> IP: advanced router
 CONFIG_IP_ADVANCED_ROUTER                       policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 0353360f37f8..1551f4813f17 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -401,7 +401,7 @@ CONFIG_NET_CADENCE=y
 # CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_NET_MPLS_GSO=m
 CONFIG_NET_PACKET_ENGINE=y
-# CONFIG_NET_SWITCHDEV is not set
+CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 18f358ab13e4..885faac88083 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -779,6 +779,11 @@ CONFIG_B44=m
 CONFIG_B44_PCI=y
 CONFIG_B44_PCICORE_AUTOSELECT=y
 CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B53=m
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SPI_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
 CONFIG_BACKLIGHT_88PM860X=m
 CONFIG_BACKLIGHT_AAT2870=m
 CONFIG_BACKLIGHT_ADP5520=m
@@ -5188,6 +5193,14 @@ CONFIG_NET_CLS_U32=m
 CONFIG_NET_CORE=y
 CONFIG_NET_DCCPPROBE=m
 CONFIG_NET_DEVLINK=m
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_BCM_SF2=m
+CONFIG_NET_DSA_HWMON=y
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_TAG_BRCM=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_TRAILER=y
 CONFIG_NET_EGRESS=y
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_CANID=m
@@ -6516,6 +6529,7 @@ CONFIG_ROCKCHIP_PM_DOMAINS=y
 CONFIG_ROCKCHIP_SARADC=m
 CONFIG_ROCKCHIP_THERMAL=m
 CONFIG_ROCKCHIP_TIMER=y
+CONFIG_ROCKER=m
 CONFIG_ROCKETPORT=m
 CONFIG_ROMFS_BACKED_BY_BLOCK=y
 # CONFIG_ROMFS_BACKED_BY_BOTH is not set
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 4246e24a3949..ba1c152a2b41 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -318,7 +318,7 @@ CONFIG_NET_DROP_MONITOR=m
 CONFIG_NET_KEY_MIGRATE=y
 CONFIG_NET_MPLS_GSO=y
 # CONFIG_NET_PACKET_ENGINE is not set
-CONFIG_NET_SWITCHDEV=y
+# CONFIG_NET_SWITCHDEV is not set
 # CONFIG_NET_TCPPROBE is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NET_VENDOR_ADAPTEC is not set
-- 
2.39.2