Skip to content

[code sync] Merge code from sonic-net/sonic-swss:202511 to 202601#245

Merged
mssonicbld merged 2 commits into
Azure:202601from
mssonicbld:sonicbld/202601-merge
Jun 24, 2026
Merged

[code sync] Merge code from sonic-net/sonic-swss:202511 to 202601#245
mssonicbld merged 2 commits into
Azure:202601from
mssonicbld:sonicbld/202601-merge

Conversation

@mssonicbld

Copy link
Copy Markdown
Collaborator
* 96c7f2a7 - (origin/202511) portsorch: treat autoneg=off as no-op when AN is not supported (#4698) (2026-06-23) [mssonicbld]<br>```

mssonicbld and others added 2 commits June 23, 2026 17:13
#### Why I did it

Implements the fix for sonic-net/sonic-mgmt#24066

When autoneg is configured as 'off' on a platform whose ASIC does not support autoneg, the previous code logged an error and dropped the entire port config task (speed, admin_state etc).

#### How I did it
Disabling autoneg on such a platform is a no-op — so there is no reason to error out. Skipping allows us to apply the other configs. Changes introduced another else case to handle this scenario gracefully

#### How to verify it

Before the changes: Links do not come up since the admin_state config is dropped

```
2026 Apr 21 04:55:49.058252 humm119 ERR swss#orchagent: :- doPortTask: Ethernet0: autoneg is not supported (cap=0)
2026 Apr 21 04:55:49.613104 humm119 ERR swss#orchagent: :- doPortTask: Ethernet244: autoneg is not supported (cap=0)
```

After the changes: Links come up
```
2026 Apr 21 05:07:05.364331 humm119 INFO swss#orchagent: :- operator(): FIELD: autoneg, VALUE: off
2026 Apr 21 05:07:05.364666 humm119 INFO swss#orchagent: :- doPortTask: Ethernet0: autoneg not supported; disable is no-op
2026 Apr 21 05:07:05.364693 humm119 NOTICE swss#orchagent: :- doPortTask: Set port Ethernet0 autoneg to off
2026 Apr 21 05:07:05.963385 humm119 INFO swss#orchagent: :- operator(): FIELD: autoneg, VALUE: off
2026 Apr 21 05:07:05.963823 humm119 INFO swss#orchagent: :- doPortTask: Ethernet244: autoneg not supported; disable is no-op
2026 Apr 21 05:07:05.963852 humm119 NOTICE swss#orchagent: :- doPortTask: Set port Ethernet244 autoneg to off
```
```
Ethernet0 96,97,98,99 400G 9100 rs etp1 routed up up QSFP-DD Double Density 8X Pluggable Transceiver N/A
Ethernet244 236,237,238,239 400G 9100 rs etp62 routed up up QSFP+ or later with CMIS N/A
```

**Details if related**

#### Which release branch to port

- [ ] master
- [x] 202511
- [ ] 202505

Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
@mssonicbld mssonicbld requested a review from prsunny as a code owner June 24, 2026 03:03
@mssonicbld mssonicbld merged commit 4a6d3f4 into Azure:202601 Jun 24, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant