mirror of
https://github.com/Telecominfraproject/OpenNetworkLinux.git
synced 2026-01-09 16:51:30 +00:00
Merge pull request #531 from MellanoxBSP/upstream_work
Add: MSN3700/MSN3700C systems
This commit is contained in:
@@ -0,0 +1,33 @@
|
||||
From ed87f7294ec22fe2e9780fec900f25954a720c8f Mon Sep 17 00:00:00 2001
|
||||
From: Vadim Pasternak <vadimp@mellanox.com>
|
||||
Date: Thu, 3 Jan 2019 18:02:06 +0000
|
||||
Subject: [PATCH 2/4] qsfp_sysfs: Fix dmidecode call
|
||||
|
||||
---
|
||||
drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c b/drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c
|
||||
index 07cc7ea..c072b91 100644
|
||||
--- a/drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c
|
||||
+++ b/drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c
|
||||
@@ -231,14 +231,14 @@ mlxsw_qsfp_cpld_show(struct device *dev, struct device_attribute *attr,
|
||||
return sprintf(buf, "%u\n", version);
|
||||
}
|
||||
|
||||
-static int __init mlxsw_qsfp_dmi_set_cpld_num(const struct dmi_system_id *dmi)
|
||||
+static int mlxsw_qsfp_dmi_set_cpld_num(const struct dmi_system_id *dmi)
|
||||
{
|
||||
mlxsw_qsfp_cpld_num = MLXSW_QSFP_MAX_CPLD_NUM;
|
||||
|
||||
return 1;
|
||||
};
|
||||
|
||||
-static struct dmi_system_id mlxsw_qsfp_dmi_table[] __initdata = {
|
||||
+static const struct dmi_system_id mlxsw_qsfp_dmi_table[] = {
|
||||
{
|
||||
.callback = mlxsw_qsfp_dmi_set_cpld_num,
|
||||
.matches = {
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
From c6a95c1ea4518a19cf46e8d0c844ae980df4c5da Mon Sep 17 00:00:00 2001
|
||||
From: Vadim Pasternak <vadimp@mellanox.com>
|
||||
Date: Thu, 3 Jan 2019 18:05:01 +0000
|
||||
Subject: [PATCH v1] mlxsw: qsfp_sysfs: Support extended port numbers for
|
||||
Spectrume2 chip
|
||||
|
||||
Add system type detection through DMI table in order to distinct between
|
||||
the systems supporting up to 64 and up to 128 ports.
|
||||
|
||||
Signed-off-by: Vadim Pasternak <vadimp@mellanox.com>
|
||||
---
|
||||
drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c | 19 +++++++++++++++++--
|
||||
1 file changed, 17 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c b/drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c
|
||||
index c072b91..bee2a08 100644
|
||||
--- a/drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c
|
||||
+++ b/drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c
|
||||
@@ -47,7 +47,7 @@
|
||||
#define MLXSW_QSFP_SUB_PAGE_NUM 3
|
||||
#define MLXSW_QSFP_SUB_PAGE_SIZE 48
|
||||
#define MLXSW_QSFP_LAST_SUB_PAGE_SIZE 32
|
||||
-#define MLXSW_QSFP_MAX_NUM 64
|
||||
+#define MLXSW_QSFP_MAX_NUM 128
|
||||
#define MLXSW_QSFP_MIN_REQ_LEN 4
|
||||
#define MLXSW_QSFP_STATUS_VALID_TIME (120 * HZ)
|
||||
#define MLXSW_QSFP_MAX_CPLD_NUM 3
|
||||
@@ -88,6 +88,7 @@ struct mlxsw_qsfp {
|
||||
};
|
||||
|
||||
static int mlxsw_qsfp_cpld_num = MLXSW_QSFP_MIN_CPLD_NUM;
|
||||
+static int mlxsw_qsfp_num = MLXSW_QSFP_MAX_NUM / 2;
|
||||
|
||||
static int
|
||||
mlxsw_qsfp_query_module_eeprom(struct mlxsw_qsfp *mlxsw_qsfp, u8 index,
|
||||
@@ -238,6 +239,13 @@ static int mlxsw_qsfp_dmi_set_cpld_num(const struct dmi_system_id *dmi)
|
||||
return 1;
|
||||
};
|
||||
|
||||
+static int mlxsw_qsfp_dmi_set_qsfp_num(const struct dmi_system_id *dmi)
|
||||
+{
|
||||
+ mlxsw_qsfp_num = MLXSW_QSFP_MAX_NUM;
|
||||
+
|
||||
+ return 1;
|
||||
+};
|
||||
+
|
||||
static const struct dmi_system_id mlxsw_qsfp_dmi_table[] = {
|
||||
{
|
||||
.callback = mlxsw_qsfp_dmi_set_cpld_num,
|
||||
@@ -253,6 +261,13 @@ static const struct dmi_system_id mlxsw_qsfp_dmi_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "MSN27"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ .callback = mlxsw_qsfp_dmi_set_qsfp_num,
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_BOARD_VENDOR, "Mellanox Technologies"),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "MSN37"),
|
||||
+ },
|
||||
+ },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(dmi, mlxsw_qsfp_dmi_table);
|
||||
@@ -283,7 +298,7 @@ int mlxsw_qsfp_init(struct mlxsw_core *mlxsw_core,
|
||||
mlxsw_qsfp->bus_info = mlxsw_bus_info;
|
||||
mlxsw_bus_info->dev->platform_data = mlxsw_qsfp;
|
||||
|
||||
- for (i = 1; i <= MLXSW_QSFP_MAX_NUM; i++) {
|
||||
+ for (i = 1; i <= mlxsw_qsfp_num; i++) {
|
||||
mlxsw_reg_pmlp_pack(pmlp_pl, i);
|
||||
err = mlxsw_reg_query(mlxsw_qsfp->core, MLXSW_REG(pmlp),
|
||||
pmlp_pl);
|
||||
--
|
||||
2.1.4
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,86 @@
|
||||
From d83d9b8a4813c6a626db151f9b9269d8c69a032a Mon Sep 17 00:00:00 2001
|
||||
From: Vadim Pasternak <vadimp@mellanox.com>
|
||||
Date: Sun, 6 Jan 2019 12:25:46 +0000
|
||||
Subject: [PATCH v1] mlxsw: qsfp_sysfs: Support port numbers initialization
|
||||
|
||||
Support port numbers initialization based on system type.
|
||||
|
||||
Signed-off-by: Vadim Pasternak <vadimp@mellanox.com>
|
||||
---
|
||||
drivers/net/ethernet/mellanox/mlxsw/core.c | 20 +++++++++++++++++++-
|
||||
drivers/net/ethernet/mellanox/mlxsw/core.h | 10 +++-------
|
||||
drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c | 1 +
|
||||
3 files changed, 23 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c
|
||||
index 10863d6..01987f0 100644
|
||||
--- a/drivers/net/ethernet/mellanox/mlxsw/core.c
|
||||
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.c
|
||||
@@ -114,12 +114,30 @@ struct mlxsw_core {
|
||||
struct mlxsw_resources resources;
|
||||
struct mlxsw_hwmon *hwmon;
|
||||
struct mlxsw_thermal *thermal;
|
||||
-struct mlxsw_qsfp *qsfp;
|
||||
+ struct mlxsw_qsfp *qsfp;
|
||||
struct mlxsw_core_port ports[MLXSW_PORT_MAX_PORTS];
|
||||
+ unsigned int max_ports;
|
||||
unsigned long driver_priv[0];
|
||||
/* driver_priv has to be always the last item */
|
||||
};
|
||||
|
||||
+#define MLXSW_PORT_MAX_PORTS_DEFAULT 0x40
|
||||
+unsigned int mlxsw_core_max_ports(const struct mlxsw_core *mlxsw_core)
|
||||
+{
|
||||
+ if (mlxsw_core->max_ports)
|
||||
+ return mlxsw_core->max_ports;
|
||||
+ else
|
||||
+ return MLXSW_PORT_MAX_PORTS_DEFAULT;
|
||||
+}
|
||||
+EXPORT_SYMBOL(mlxsw_core_max_ports);
|
||||
+
|
||||
+void mlxsw_core_max_ports_set(struct mlxsw_core *mlxsw_core,
|
||||
+ unsigned int max_ports)
|
||||
+{
|
||||
+ mlxsw_core->max_ports = max_ports;
|
||||
+}
|
||||
+EXPORT_SYMBOL(mlxsw_core_max_ports_set);
|
||||
+
|
||||
void *mlxsw_core_driver_priv(struct mlxsw_core *mlxsw_core)
|
||||
{
|
||||
return mlxsw_core->driver_priv;
|
||||
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.h b/drivers/net/ethernet/mellanox/mlxsw/core.h
|
||||
index 4fb104e..db27dd0 100644
|
||||
--- a/drivers/net/ethernet/mellanox/mlxsw/core.h
|
||||
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.h
|
||||
@@ -63,13 +63,9 @@ struct mlxsw_driver;
|
||||
struct mlxsw_bus;
|
||||
struct mlxsw_bus_info;
|
||||
|
||||
-#define MLXSW_PORT_MAX_PORTS_DEFAULT 0x40
|
||||
-static inline unsigned int
|
||||
-mlxsw_core_max_ports(const struct mlxsw_core *mlxsw_core)
|
||||
-{
|
||||
- return MLXSW_PORT_MAX_PORTS_DEFAULT;
|
||||
-}
|
||||
-
|
||||
+unsigned int mlxsw_core_max_ports(const struct mlxsw_core *mlxsw_core);
|
||||
+void mlxsw_core_max_ports_set(struct mlxsw_core *mlxsw_core,
|
||||
+ unsigned int max_ports);
|
||||
void *mlxsw_core_driver_priv(struct mlxsw_core *mlxsw_core);
|
||||
|
||||
int mlxsw_core_driver_register(struct mlxsw_driver *mlxsw_driver);
|
||||
diff --git a/drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c b/drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c
|
||||
index bee2a08..0781f16 100644
|
||||
--- a/drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c
|
||||
+++ b/drivers/net/ethernet/mellanox/mlxsw/qsfp_sysfs.c
|
||||
@@ -298,6 +298,7 @@ int mlxsw_qsfp_init(struct mlxsw_core *mlxsw_core,
|
||||
mlxsw_qsfp->bus_info = mlxsw_bus_info;
|
||||
mlxsw_bus_info->dev->platform_data = mlxsw_qsfp;
|
||||
|
||||
+ mlxsw_core_max_ports_set(mlxsw_core, mlxsw_qsfp_num);
|
||||
for (i = 1; i <= mlxsw_qsfp_num; i++) {
|
||||
mlxsw_reg_pmlp_pack(pmlp_pl, i);
|
||||
err = mlxsw_reg_query(mlxsw_qsfp->core, MLXSW_REG(pmlp),
|
||||
--
|
||||
2.1.4
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,330 @@
|
||||
diff --git a/packages/base/any/kernels/4.9-lts/configs/x86_64-all/x86_64-all.config b/packages/base/any/kernels/4.9-lts/configs/x86_64-all/x86_64-all.config
|
||||
index 423e0d6..d468093 100644
|
||||
--- a/packages/base/any/kernels/4.9-lts/configs/x86_64-all/x86_64-all.config
|
||||
+++ b/packages/base/any/kernels/4.9-lts/configs/x86_64-all/x86_64-all.config
|
||||
@@ -162,7 +162,7 @@ CONFIG_CGROUP_FREEZER=y
|
||||
# CONFIG_CGROUP_HUGETLB is not set
|
||||
CONFIG_CPUSETS=y
|
||||
CONFIG_PROC_PID_CPUSET=y
|
||||
-# CONFIG_CGROUP_DEVICE is not set
|
||||
+CONFIG_CGROUP_DEVICE=y
|
||||
CONFIG_CGROUP_CPUACCT=y
|
||||
# CONFIG_CGROUP_PERF is not set
|
||||
# CONFIG_CGROUP_DEBUG is not set
|
||||
@@ -802,7 +802,7 @@ CONFIG_IP_MROUTE=y
|
||||
CONFIG_IP_PIMSM_V1=y
|
||||
CONFIG_IP_PIMSM_V2=y
|
||||
CONFIG_SYN_COOKIES=y
|
||||
-# CONFIG_NET_UDP_TUNNEL is not set
|
||||
+CONFIG_NET_UDP_TUNNEL=y
|
||||
# CONFIG_NET_FOU is not set
|
||||
# CONFIG_NET_FOU_IP_TUNNELS is not set
|
||||
# CONFIG_INET_AH is not set
|
||||
@@ -865,23 +865,40 @@ CONFIG_NET_PTP_CLASSIFY=y
|
||||
# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
|
||||
CONFIG_NETFILTER=y
|
||||
# CONFIG_NETFILTER_DEBUG is not set
|
||||
-# CONFIG_NETFILTER_ADVANCED is not set
|
||||
+CONFIG_NETFILTER_ADVANCED=y
|
||||
+CONFIG_BRIDGE_NETFILTER=m
|
||||
|
||||
#
|
||||
# Core Netfilter Configuration
|
||||
#
|
||||
CONFIG_NETFILTER_INGRESS=y
|
||||
CONFIG_NETFILTER_NETLINK=y
|
||||
+# CONFIG_NETFILTER_NETLINK_ACCT is not set
|
||||
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
|
||||
CONFIG_NETFILTER_NETLINK_LOG=y
|
||||
CONFIG_NF_CONNTRACK=y
|
||||
CONFIG_NF_LOG_COMMON=m
|
||||
+# CONFIG_NF_CONNTRACK_MARK is not set
|
||||
CONFIG_NF_CONNTRACK_SECMARK=y
|
||||
CONFIG_NF_CONNTRACK_PROCFS=y
|
||||
+# CONFIG_NF_CONNTRACK_EVENTS is not set
|
||||
+# CONFIG_NF_CONNTRACK_TIMEOUT is not set
|
||||
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
|
||||
+# CONFIG_NF_CT_PROTO_DCCP is not set
|
||||
+# CONFIG_NF_CT_PROTO_SCTP is not set
|
||||
+# CONFIG_NF_CT_PROTO_UDPLITE is not set
|
||||
+# CONFIG_NF_CONNTRACK_AMANDA is not set
|
||||
CONFIG_NF_CONNTRACK_FTP=y
|
||||
+# CONFIG_NF_CONNTRACK_H323 is not set
|
||||
CONFIG_NF_CONNTRACK_IRC=y
|
||||
# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
|
||||
+# CONFIG_NF_CONNTRACK_SNMP is not set
|
||||
+# CONFIG_NF_CONNTRACK_PPTP is not set
|
||||
+# CONFIG_NF_CONNTRACK_SANE is not set
|
||||
CONFIG_NF_CONNTRACK_SIP=y
|
||||
+# CONFIG_NF_CONNTRACK_TFTP is not set
|
||||
CONFIG_NF_CT_NETLINK=y
|
||||
+# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
|
||||
# CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
|
||||
CONFIG_NF_NAT=m
|
||||
CONFIG_NF_NAT_NEEDED=y
|
||||
@@ -898,28 +915,142 @@ CONFIG_NETFILTER_XTABLES=y
|
||||
# Xtables combined modules
|
||||
#
|
||||
CONFIG_NETFILTER_XT_MARK=m
|
||||
+# CONFIG_NETFILTER_XT_CONNMARK is not set
|
||||
+# CONFIG_NETFILTER_XT_SET is not set
|
||||
|
||||
#
|
||||
# Xtables targets
|
||||
#
|
||||
+# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
|
||||
+# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
|
||||
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
|
||||
+# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
|
||||
CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y
|
||||
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
|
||||
+# CONFIG_NETFILTER_XT_TARGET_HL is not set
|
||||
+# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
|
||||
+# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
|
||||
+# CONFIG_NETFILTER_XT_TARGET_LED is not set
|
||||
CONFIG_NETFILTER_XT_TARGET_LOG=m
|
||||
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
|
||||
CONFIG_NETFILTER_XT_NAT=m
|
||||
# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set
|
||||
CONFIG_NETFILTER_XT_TARGET_NFLOG=y
|
||||
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
|
||||
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
|
||||
# CONFIG_NETFILTER_XT_TARGET_REDIRECT is not set
|
||||
+# CONFIG_NETFILTER_XT_TARGET_TEE is not set
|
||||
+# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
|
||||
CONFIG_NETFILTER_XT_TARGET_SECMARK=y
|
||||
CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
|
||||
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
|
||||
|
||||
#
|
||||
# Xtables matches
|
||||
#
|
||||
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
|
||||
+# CONFIG_NETFILTER_XT_MATCH_BPF is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
|
||||
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
|
||||
+# CONFIG_NETFILTER_XT_MATCH_CPU is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_ECN is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_HL is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_IPVS is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_L2TP is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
|
||||
CONFIG_NETFILTER_XT_MATCH_POLICY=y
|
||||
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_RECENT is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
|
||||
CONFIG_NETFILTER_XT_MATCH_STATE=y
|
||||
-# CONFIG_IP_SET is not set
|
||||
-# CONFIG_IP_VS is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
|
||||
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
|
||||
+CONFIG_IP_SET=y
|
||||
+CONFIG_IP_SET_MAX=256
|
||||
+# CONFIG_IP_SET_BITMAP_IP is not set
|
||||
+# CONFIG_IP_SET_BITMAP_IPMAC is not set
|
||||
+# CONFIG_IP_SET_BITMAP_PORT is not set
|
||||
+# CONFIG_IP_SET_HASH_IP is not set
|
||||
+# CONFIG_IP_SET_HASH_IPMARK is not set
|
||||
+# CONFIG_IP_SET_HASH_IPPORT is not set
|
||||
+# CONFIG_IP_SET_HASH_IPPORTIP is not set
|
||||
+# CONFIG_IP_SET_HASH_IPPORTNET is not set
|
||||
+# CONFIG_IP_SET_HASH_MAC is not set
|
||||
+# CONFIG_IP_SET_HASH_NETPORTNET is not set
|
||||
+# CONFIG_IP_SET_HASH_NET is not set
|
||||
+# CONFIG_IP_SET_HASH_NETNET is not set
|
||||
+# CONFIG_IP_SET_HASH_NETPORT is not set
|
||||
+# CONFIG_IP_SET_HASH_NETIFACE is not set
|
||||
+# CONFIG_IP_SET_LIST_SET is not set
|
||||
+CONFIG_IP_VS=y
|
||||
+# CONFIG_IP_VS_IPV6 is not set
|
||||
+# CONFIG_IP_VS_DEBUG is not set
|
||||
+CONFIG_IP_VS_TAB_BITS=12
|
||||
+
|
||||
+#
|
||||
+# IPVS transport protocol load balancing support
|
||||
+#
|
||||
+# CONFIG_IP_VS_PROTO_TCP is not set
|
||||
+# CONFIG_IP_VS_PROTO_UDP is not set
|
||||
+# CONFIG_IP_VS_PROTO_AH_ESP is not set
|
||||
+# CONFIG_IP_VS_PROTO_ESP is not set
|
||||
+# CONFIG_IP_VS_PROTO_AH is not set
|
||||
+# CONFIG_IP_VS_PROTO_SCTP is not set
|
||||
+
|
||||
+#
|
||||
+# IPVS scheduler
|
||||
+#
|
||||
+# CONFIG_IP_VS_RR is not set
|
||||
+# CONFIG_IP_VS_WRR is not set
|
||||
+# CONFIG_IP_VS_LC is not set
|
||||
+# CONFIG_IP_VS_WLC is not set
|
||||
+# CONFIG_IP_VS_FO is not set
|
||||
+# CONFIG_IP_VS_OVF is not set
|
||||
+# CONFIG_IP_VS_LBLC is not set
|
||||
+# CONFIG_IP_VS_LBLCR is not set
|
||||
+# CONFIG_IP_VS_DH is not set
|
||||
+# CONFIG_IP_VS_SH is not set
|
||||
+# CONFIG_IP_VS_SED is not set
|
||||
+# CONFIG_IP_VS_NQ is not set
|
||||
+
|
||||
+#
|
||||
+# IPVS SH scheduler
|
||||
+#
|
||||
+CONFIG_IP_VS_SH_TAB_BITS=8
|
||||
+
|
||||
+#
|
||||
+# IPVS application helper
|
||||
+#
|
||||
+# CONFIG_IP_VS_NFCT is not set
|
||||
|
||||
#
|
||||
# IP: Netfilter Configuration
|
||||
@@ -935,12 +1066,24 @@ CONFIG_NF_NAT_MASQUERADE_IPV4=m
|
||||
# CONFIG_NF_NAT_PPTP is not set
|
||||
# CONFIG_NF_NAT_H323 is not set
|
||||
CONFIG_IP_NF_IPTABLES=y
|
||||
+# CONFIG_IP_NF_MATCH_AH is not set
|
||||
+# CONFIG_IP_NF_MATCH_ECN is not set
|
||||
+# CONFIG_IP_NF_MATCH_RPFILTER is not set
|
||||
+# CONFIG_IP_NF_MATCH_TTL is not set
|
||||
CONFIG_IP_NF_FILTER=y
|
||||
CONFIG_IP_NF_TARGET_REJECT=y
|
||||
+# CONFIG_IP_NF_TARGET_SYNPROXY is not set
|
||||
CONFIG_IP_NF_NAT=m
|
||||
CONFIG_IP_NF_TARGET_MASQUERADE=m
|
||||
+# CONFIG_IP_NF_TARGET_NETMAP is not set
|
||||
+# CONFIG_IP_NF_TARGET_REDIRECT is not set
|
||||
CONFIG_IP_NF_MANGLE=y
|
||||
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
|
||||
+# CONFIG_IP_NF_TARGET_ECN is not set
|
||||
+# CONFIG_IP_NF_TARGET_TTL is not set
|
||||
# CONFIG_IP_NF_RAW is not set
|
||||
+# CONFIG_IP_NF_SECURITY is not set
|
||||
+# CONFIG_IP_NF_ARPTABLES is not set
|
||||
|
||||
#
|
||||
# IPv6: Netfilter Configuration
|
||||
@@ -950,23 +1093,43 @@ CONFIG_NF_CONNTRACK_IPV6=y
|
||||
# CONFIG_NF_DUP_IPV6 is not set
|
||||
CONFIG_NF_REJECT_IPV6=y
|
||||
CONFIG_NF_LOG_IPV6=m
|
||||
+# CONFIG_NF_NAT_IPV6 is not set
|
||||
CONFIG_IP6_NF_IPTABLES=y
|
||||
+# CONFIG_IP6_NF_MATCH_AH is not set
|
||||
+# CONFIG_IP6_NF_MATCH_EUI64 is not set
|
||||
+# CONFIG_IP6_NF_MATCH_FRAG is not set
|
||||
+# CONFIG_IP6_NF_MATCH_OPTS is not set
|
||||
+# CONFIG_IP6_NF_MATCH_HL is not set
|
||||
CONFIG_IP6_NF_MATCH_IPV6HEADER=y
|
||||
+# CONFIG_IP6_NF_MATCH_MH is not set
|
||||
+# CONFIG_IP6_NF_MATCH_RPFILTER is not set
|
||||
+# CONFIG_IP6_NF_MATCH_RT is not set
|
||||
+# CONFIG_IP6_NF_TARGET_HL is not set
|
||||
CONFIG_IP6_NF_FILTER=y
|
||||
CONFIG_IP6_NF_TARGET_REJECT=y
|
||||
+# CONFIG_IP6_NF_TARGET_SYNPROXY is not set
|
||||
CONFIG_IP6_NF_MANGLE=y
|
||||
# CONFIG_IP6_NF_RAW is not set
|
||||
+# CONFIG_IP6_NF_SECURITY is not set
|
||||
+# CONFIG_IP6_NF_NAT is not set
|
||||
+# CONFIG_BRIDGE_NF_EBTABLES is not set
|
||||
# CONFIG_IP_DCCP is not set
|
||||
# CONFIG_IP_SCTP is not set
|
||||
# CONFIG_RDS is not set
|
||||
# CONFIG_TIPC is not set
|
||||
# CONFIG_ATM is not set
|
||||
# CONFIG_L2TP is not set
|
||||
-# CONFIG_BRIDGE is not set
|
||||
+CONFIG_STP=y
|
||||
+CONFIG_BRIDGE=y
|
||||
+CONFIG_BRIDGE_IGMP_SNOOPING=y
|
||||
+CONFIG_BRIDGE_VLAN_FILTERING=y
|
||||
CONFIG_HAVE_NET_DSA=y
|
||||
# CONFIG_NET_DSA is not set
|
||||
-# CONFIG_VLAN_8021Q is not set
|
||||
+CONFIG_VLAN_8021Q=m
|
||||
+# CONFIG_VLAN_8021Q_GVRP is not set
|
||||
+# CONFIG_VLAN_8021Q_MVRP is not set
|
||||
# CONFIG_DECNET is not set
|
||||
+CONFIG_LLC=y
|
||||
# CONFIG_LLC2 is not set
|
||||
# CONFIG_IPX is not set
|
||||
# CONFIG_ATALK is not set
|
||||
@@ -1028,6 +1191,7 @@ CONFIG_NET_EMATCH_STACK=32
|
||||
# CONFIG_NET_EMATCH_U32 is not set
|
||||
# CONFIG_NET_EMATCH_META is not set
|
||||
# CONFIG_NET_EMATCH_TEXT is not set
|
||||
+# CONFIG_NET_EMATCH_IPSET is not set
|
||||
CONFIG_NET_CLS_ACT=y
|
||||
# CONFIG_NET_ACT_POLICE is not set
|
||||
# CONFIG_NET_ACT_GACT is not set
|
||||
@@ -1053,7 +1217,7 @@ CONFIG_DNS_RESOLVER=y
|
||||
# CONFIG_MPLS is not set
|
||||
# CONFIG_HSR is not set
|
||||
# CONFIG_NET_SWITCHDEV is not set
|
||||
-# CONFIG_NET_L3_MASTER_DEV is not set
|
||||
+CONFIG_NET_L3_MASTER_DEV=y
|
||||
# CONFIG_NET_NCSI is not set
|
||||
CONFIG_RPS=y
|
||||
CONFIG_RFS_ACCEL=y
|
||||
@@ -1463,22 +1627,27 @@ CONFIG_NETDEVICES=y
|
||||
CONFIG_MII=y
|
||||
CONFIG_NET_CORE=y
|
||||
# CONFIG_BONDING is not set
|
||||
-# CONFIG_DUMMY is not set
|
||||
+CONFIG_DUMMY=y
|
||||
# CONFIG_EQUALIZER is not set
|
||||
# CONFIG_NET_FC is not set
|
||||
# CONFIG_IFB is not set
|
||||
# CONFIG_NET_TEAM is not set
|
||||
-# CONFIG_MACVLAN is not set
|
||||
-# CONFIG_VXLAN is not set
|
||||
-# CONFIG_MACSEC is not set
|
||||
+CONFIG_MACVLAN=y
|
||||
+CONFIG_MACVTAP=m
|
||||
+CONFIG_IPVLAN=m
|
||||
+CONFIG_VXLAN=y
|
||||
+CONFIG_GENEVE=m
|
||||
+CONFIG_GTP=m
|
||||
+CONFIG_MACSEC=m
|
||||
CONFIG_NETCONSOLE=y
|
||||
CONFIG_NETPOLL=y
|
||||
CONFIG_NET_POLL_CONTROLLER=y
|
||||
-CONFIG_TUN=y
|
||||
+CONFIG_TUN=m
|
||||
# CONFIG_TUN_VNET_CROSS_LE is not set
|
||||
CONFIG_VETH=y
|
||||
CONFIG_VIRTIO_NET=y
|
||||
# CONFIG_NLMON is not set
|
||||
+# CONFIG_NET_VRF is not set
|
||||
# CONFIG_ARCNET is not set
|
||||
|
||||
#
|
||||
@@ -16,3 +16,8 @@ driver-add-the-support-max6620.patch
|
||||
0013-Mellanox-backport-patchwork-from-kernels-4.17-4.19.patch
|
||||
0014-platform-x86-mlx-platform-backport-from-4.19.patch
|
||||
0015-platform-x86-mlx-platform-Add-support-for-register-a.patch
|
||||
0016-qsfp_sysfs-Fix-dmidecode-call.patch
|
||||
0017-mlxsw-qsfp_sysfs-Support-extended-port-numbers-for-S.patch
|
||||
0018-mlxsw-thermal-monitoring-amendments.patch
|
||||
0020-mlxsw-qsfp_sysfs-Support-port-numbers-initialization.patch
|
||||
0021-mlxsw-Align-code-with-kernel-v-5.0.patch
|
||||
|
||||
Reference in New Issue
Block a user