Page MenuHomeFreeBSD
Files F102618943

D33405.diff
No OneTemporary
Actions

D33405.diff
View Options

diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c
--- a/sys/net/ieee8023ad_lacp.c
+++ b/sys/net/ieee8023ad_lacp.c
@@ -1090,6 +1090,8 @@
speed = lacp_aggregator_bandwidth(la);
}
sc->sc_ifp->if_baudrate = speed;
+ EVENTHANDLER_INVOKE(ifnet_event, sc->sc_ifp,
+ IFNET_EVENT_UPDATE_BAUDRATE);
/* switch the active portmap over */
atomic_store_rel_int(&lsc->lsc_activemap, newmap);
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -515,6 +515,7 @@
#define IFNET_EVENT_UP 0
#define IFNET_EVENT_DOWN 1
#define IFNET_EVENT_PCP 2 /* priority code point, PCP */
+#define IFNET_EVENT_UPDATE_BAUDRATE 3
typedef void (*ifnet_event_fn)(void *, struct ifnet *ifp, int event);
EVENTHANDLER_DECLARE(ifnet_event, ifnet_event_fn);
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -221,6 +221,7 @@
static eventhandler_tag ifdetach_tag;
static eventhandler_tag iflladdr_tag;
+static eventhandler_tag ifevent_tag;
/*
* if_vlan uses two module-level synchronizations primitives to allow concurrent
@@ -327,6 +328,7 @@
static void vlan_ifdetach(void *arg, struct ifnet *ifp);
static void vlan_iflladdr(void *arg, struct ifnet *ifp);
+static void vlan_ifevent(void *arg, struct ifnet *ifp, int event);
static void vlan_lladdr_fn(void *arg, int pending);
@@ -673,6 +675,34 @@
return (0);
}
+/*
+ * A handler for interface ifnet events.
+ */
+static void
+vlan_ifevent(void *arg __unused, struct ifnet *ifp, int event)
+{
+ struct epoch_tracker et;
+ struct ifvlan *ifv;
+ struct ifvlantrunk *trunk;
+
+ if (event != IFNET_EVENT_UPDATE_BAUDRATE)
+ return;
+
+ NET_EPOCH_ENTER(et);
+ trunk = ifp->if_vlantrunk;
+ if (trunk == NULL) {
+ NET_EPOCH_EXIT(et);
+ return;
+ }
+
+ TRUNK_WLOCK(trunk);
+ VLAN_FOREACH(ifv, trunk) {
+ ifv->ifv_ifp->if_baudrate = ifp->if_baudrate;
+ }
+ TRUNK_WUNLOCK(trunk);
+ NET_EPOCH_EXIT(et);
+}
+
/*
* A handler for parent interface link layer address changes.
* If the parent interface link layer address is changed we
@@ -886,6 +916,10 @@
vlan_iflladdr, NULL, EVENTHANDLER_PRI_ANY);
if (iflladdr_tag == NULL)
return (ENOMEM);
+ ifevent_tag = EVENTHANDLER_REGISTER(ifnet_event,
+ vlan_ifevent, NULL, EVENTHANDLER_PRI_ANY);
+ if (ifevent_tag == NULL)
+ return (ENOMEM);
VLAN_LOCKING_INIT();
vlan_input_p = vlan_input;
vlan_link_state_p = vlan_link_state;
@@ -916,6 +950,7 @@
#endif
EVENTHANDLER_DEREGISTER(ifnet_departure_event, ifdetach_tag);
EVENTHANDLER_DEREGISTER(iflladdr_event, iflladdr_tag);
+ EVENTHANDLER_DEREGISTER(ifnet_event, ifevent_tag);
vlan_input_p = NULL;
vlan_link_state_p = NULL;
vlan_trunk_cap_p = NULL;

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 15, 9:41 PM (20 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14648401
Default Alt Text
D33405.diff (2 KB)

Event Timeline