Skip to content

lldp_8023: Preserve MAC Merge verify_enabled setting #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chweelinchoong wants to merge 1 commit into from
Closed

lldp_8023: Preserve MAC Merge verify_enabled setting #121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions lldp_8023.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,20 +686,19 @@ static void ieee8023_rchange_add_eth_caps(struct ieee8023_data *bd,

/* If both we and the link partner support frame preemption, we
* automatically turn our TX side on regardless of what the link
* partner may do. Since we request verification, preemption will
* partner may do. When we request verification, preemption will
* only become active once the verification process succeeds
* (the link partner ACKs our handshake). Using the largest interval
* between verification attempts permitted by our hardware allows
* the link partner a bit of wiggle room to delay enabling its pMAC
* (which responds to our verification requests).
*/
if (!mm.tx_enabled || !mm.verify_enabled ||
mm.verify_time != mm.max_verify_time) {
if (!mm.tx_enabled || mm.verify_time != mm.max_verify_time) {
LLDPAD_INFO("%s: initiating MM verification with a retry interval of %d ms...\n",
bd->ifname, mm.max_verify_time);

err = ethtool_mm_change_tx_enabled(ud->ethtool_sk, bd->ifname,
true, true,
true, mm.verify_enabled,
mm.max_verify_time);
if (err) {
LLDPAD_ERR("%s: Failed to enable TX preemption: %d\n",
Expand Down