--- zzzz-none-000/linux-4.9.279/net/bridge/br.c 2021-08-08 06:38:54.000000000 +0000 +++ puma7-arm-6591-750/linux-4.9.279/net/bridge/br.c 2023-02-08 10:58:16.000000000 +0000 @@ -11,6 +11,11 @@ * 2 of the License, or (at your option) any later version. */ +/* + * Includes Intel Corporation's changes/modifications dated: 2017. + * Changed/modified portions - Copyright (c) 2017, Intel Corporation. + */ + #include #include #include @@ -23,6 +28,10 @@ #include "br_private.h" +#ifdef CONFIG_TI_UNMANAGED_BRIDGE +extern int ti_unmanaged_bridge_handler (struct net_device *dev, unsigned long event); +#endif /* CONFIG_TI_UNMANAGED_BRIDGE */ + /* * Handle changes in state of network devices enslaved to a bridge. * @@ -37,6 +46,15 @@ bool changed_addr; int err; +#ifdef CONFIG_TI_UNMANAGED_BRIDGE + /* Pass control to the unmanaged bridge handler. */ + if (ti_unmanaged_bridge_handler(dev, event) == 0) + { + /* The event has been handled by the unmanaged bridge handler. */ + return NOTIFY_DONE; + } +#endif /* CONFIG_TI_UNMANAGED_BRIDGE */ + /* register of bridge completed, add sysfs entries */ if ((dev->priv_flags & IFF_EBRIDGE) && event == NETDEV_REGISTER) { br_sysfs_addbr(dev);