Skip to content

Commit e065786

Browse files
judyjosephjudyjoseph
authored
Merge branch 'master' into master_lc
2 parents 9477789 + d9e257c commit e065786

File tree

211 files changed

+6813
-11628
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+6813
-11628
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
[submodule "src/sonic-frr/frr"]
4747
path = src/sonic-frr/frr
4848
url = https://github.com/sonic-net/sonic-frr.git
49-
branch = frr-10.3
49+
branch = frr-10.4.1
5050
[submodule "platform/p4/p4-hlir/p4-hlir-v1.1"]
5151
path = platform/p4/p4-hlir/p4-hlir-v1.1
5252
url = https://github.com/p4lang/p4-hlir.git

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
NOJESSIE ?= 1
44
NOSTRETCH ?= 1
5-
NOBUSTER ?= 0
6-
NOBULLSEYE ?= 0
5+
NOBUSTER ?= 1
6+
NOBULLSEYE ?= 1
77
NOBOOKWORM ?= 0
88
NOTRIXIE ?= 1
99

‎device/arista/x86_64-arista_7060x6_16pe_384c_b/Arista-7060X6-16PE-384C-B-O128S2/th5-a7060x6-16pe-384c.config.bcm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1410,8 +1410,8 @@ bcm_device:
14101410
0:
14111411
global:
14121412
ftem_mem_entries: 65536
1413-
#enable port queue drop stats
1414-
sai_stats_support_mask: 0x800
1413+
#enable port queue drop stats + enable egress queue drop flex counter
1414+
sai_stats_support_mask: 0x804
14151415
#disable vxlan tunnel stats
14161416
sai_stats_disable_mask: 0x200
14171417
#For PPIU Mode, Set resources for counters in global mode counters like ACL, etc

‎device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-O128/th5-a7060x6-64pe-lt2.config.bcm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1384,7 +1384,7 @@ bcm_device:
13841384
global:
13851385
ftem_mem_entries: 65536
13861386
#enable port queue drop stats
1387-
sai_stats_support_mask: 0x880
1387+
sai_stats_support_mask: 0x884
13881388
#disable vxlan tunnel stats
13891389
sai_stats_disable_mask: 0x200
13901390
#For PPIU Mode, Set resources for counters in global mode counters like ACL, etc

‎device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-O128/th5-a7060x6-64pe.config.bcm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,8 +1382,8 @@ bcm_device:
13821382
0:
13831383
global:
13841384
ftem_mem_entries: 65536
1385-
#enable port queue drop stats
1386-
sai_stats_support_mask: 0x880
1385+
#enable port queue drop stats + enable egress queue drop flex counter
1386+
sai_stats_support_mask: 0x804
13871387
#disable vxlan tunnel stats
13881388
sai_stats_disable_mask: 0x200
13891389
#For PPIU Mode, Set resources for counters in global mode counters like ACL, etc

‎device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-P32O64/th5-a7060x6-64pe.config.bcm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1264,7 +1264,7 @@ bcm_device:
12641264
0:
12651265
global:
12661266
ftem_mem_entries: 65536
1267-
sai_stats_support_mask: 0x880
1267+
sai_stats_support_mask: 0x884
12681268
#disable vxlan tunnel stats
12691269
sai_stats_disable_mask: 0x200
12701270
#For PPIU Mode, Set resources for counters in global mode counters like ACL, etc

‎device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-P32V128/th5-a7060x6-64pe.config.bcm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1518,7 +1518,7 @@ bcm_device:
15181518
0:
15191519
global:
15201520
ftem_mem_entries: 65536
1521-
sai_stats_support_mask: 0x880
1521+
sai_stats_support_mask: 0x884
15221522
global_flexctr_ing_action_num_reserved: 20
15231523
global_flexctr_ing_pool_num_reserved: 8
15241524
global_flexctr_ing_op_profile_num_reserved: 20

‎device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-P64/th5-a7060x6-64pe.config.bcm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,7 @@ bcm_device:
11291129
0:
11301130
global:
11311131
ftem_mem_entries: 65536
1132-
sai_stats_support_mask: 0x880
1132+
sai_stats_support_mask: 0x884
11331133
#disable vxlan tunnel stats
11341134
sai_stats_disable_mask: 0x200
11351135
global_flexctr_ing_action_num_reserved: 20

‎device/mellanox/x86_64-nvidia_sn4280-r0/Mellanox-SN4280-O28/sai.profile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4280.xml
22
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
33
SAI_INDEPENDENT_MODULE_MODE=1
44
SAI_NOT_DROP_SIP_DIP_LINK_LOCAL=1
5+
SAI_ACL_MULTI_BINDING_ENABLED=1

‎device/mellanox/x86_64-nvidia_sn4280-r0/Mellanox-SN4280-O8C80/sai.profile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4280_8x400g_80x100g.xml
22
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
33
SAI_INDEPENDENT_MODULE_MODE=1
4-
SAI_NOT_DROP_SIP_DIP_LINK_LOCAL=1
4+
SAI_NOT_DROP_SIP_DIP_LINK_LOCAL=1
5+
SAI_ACL_MULTI_BINDING_ENABLED=1

0 commit comments

Comments
 (0)