Page MenuHomeFreeBSD
Files F102738132

D25239.diff
No OneTemporary
Actions

D25239.diff
View Options

Index: head/sbin/ifconfig/iflagg.c
===================================================================
--- head/sbin/ifconfig/iflagg.c
+++ head/sbin/ifconfig/iflagg.c
@@ -141,8 +141,8 @@
case -LAGG_OPT_LACP_TXTEST:
case LAGG_OPT_LACP_RXTEST:
case -LAGG_OPT_LACP_RXTEST:
- case LAGG_OPT_LACP_TIMEOUT:
- case -LAGG_OPT_LACP_TIMEOUT:
+ case LAGG_OPT_LACP_FAST_TIMO:
+ case -LAGG_OPT_LACP_FAST_TIMO:
break;
default:
err(1, "Invalid lagg option");
@@ -316,8 +316,8 @@
DEF_CMD("-lacp_txtest", -LAGG_OPT_LACP_TXTEST, setlaggsetopt),
DEF_CMD("lacp_rxtest", LAGG_OPT_LACP_RXTEST, setlaggsetopt),
DEF_CMD("-lacp_rxtest", -LAGG_OPT_LACP_RXTEST, setlaggsetopt),
- DEF_CMD("lacp_fast_timeout", LAGG_OPT_LACP_TIMEOUT, setlaggsetopt),
- DEF_CMD("-lacp_fast_timeout", -LAGG_OPT_LACP_TIMEOUT, setlaggsetopt),
+ DEF_CMD("lacp_fast_timeout", LAGG_OPT_LACP_FAST_TIMO, setlaggsetopt),
+ DEF_CMD("-lacp_fast_timeout", -LAGG_OPT_LACP_FAST_TIMO, setlaggsetopt),
DEF_CMD_ARG("flowid_shift", setlaggflowidshift),
DEF_CMD_ARG("rr_limit", setlaggrr_limit),
};
Index: head/sys/net/if_lagg.h
===================================================================
--- head/sys/net/if_lagg.h
+++ head/sys/net/if_lagg.h
@@ -148,7 +148,7 @@
#define LAGG_OPT_LACP_STRICT 0x10 /* LACP strict mode */
#define LAGG_OPT_LACP_TXTEST 0x20 /* LACP debug: txtest */
#define LAGG_OPT_LACP_RXTEST 0x40 /* LACP debug: rxtest */
-#define LAGG_OPT_LACP_TIMEOUT 0x80 /* LACP timeout */
+#define LAGG_OPT_LACP_FAST_TIMO 0x80 /* LACP fast timeout */
#define LAGG_OPT_RR_LIMIT 0x100 /* RR stride */
u_int ro_count; /* number of ports */
u_int ro_active; /* active port count */
@@ -162,7 +162,7 @@
#define LAGG_OPT_BITS "\020\001USE_FLOWID\003USE_NUMA" \
"\005LACP_STRICT\006LACP_TXTEST" \
- "\007LACP_RXTEST"
+ "\007LACP_RXTEST\010LACP_FAST_TIMO"
#ifdef _KERNEL
Index: head/sys/net/if_lagg.c
===================================================================
--- head/sys/net/if_lagg.c
+++ head/sys/net/if_lagg.c
@@ -1246,7 +1246,7 @@
if (lsc->lsc_strict_mode != 0)
ro->ro_opts |= LAGG_OPT_LACP_STRICT;
if (lsc->lsc_fast_timeout != 0)
- ro->ro_opts |= LAGG_OPT_LACP_TIMEOUT;
+ ro->ro_opts |= LAGG_OPT_LACP_FAST_TIMO;
ro->ro_active = sc->sc_active;
} else {
@@ -1305,8 +1305,8 @@
case -LAGG_OPT_LACP_RXTEST:
case LAGG_OPT_LACP_STRICT:
case -LAGG_OPT_LACP_STRICT:
- case LAGG_OPT_LACP_TIMEOUT:
- case -LAGG_OPT_LACP_TIMEOUT:
+ case LAGG_OPT_LACP_FAST_TIMO:
+ case -LAGG_OPT_LACP_FAST_TIMO:
valid = lacp = 1;
break;
default:
@@ -1366,14 +1366,14 @@
case -LAGG_OPT_LACP_STRICT:
lsc->lsc_strict_mode = 0;
break;
- case LAGG_OPT_LACP_TIMEOUT:
+ case LAGG_OPT_LACP_FAST_TIMO:
LACP_LOCK(lsc);
LIST_FOREACH(lp, &lsc->lsc_ports, lp_next)
lp->lp_state |= LACP_STATE_TIMEOUT;
LACP_UNLOCK(lsc);
lsc->lsc_fast_timeout = 1;
break;
- case -LAGG_OPT_LACP_TIMEOUT:
+ case -LAGG_OPT_LACP_FAST_TIMO:
LACP_LOCK(lsc);
LIST_FOREACH(lp, &lsc->lsc_ports, lp_next)
lp->lp_state &= ~LACP_STATE_TIMEOUT;

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 17, 1:29 PM (20 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14678943
Default Alt Text
D25239.diff (3 KB)

Event Timeline