--- zzzz-none-000/linux-5.15.111/net/openvswitch/vport-gre.c 2023-05-11 14:00:40.000000000 +0000 +++ puma7-atom-6670-761/linux-5.15.111/net/openvswitch/vport-gre.c 2024-02-07 10:23:30.000000000 +0000 @@ -3,6 +3,16 @@ * Copyright (c) 2007-2014 Nicira, Inc. */ +/* + * Includes Inango Systems Ltd’s changes/modifications dated: 2021. + * Changed/modified portions - Copyright (c) 2021 , Inango Systems Ltd. + */ + +/* + Includes MaxLinear's changes dated: 2021, 2022, 2023. + Changed portions - Copyright 2021-2023 MaxLinear, Inc. +*/ + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include @@ -74,8 +84,11 @@ vport = gre_tnl_create(parms); if (IS_ERR(vport)) return vport; - +#ifdef CONFIG_OPENVSWITCH_BRCOMPAT + return ovs_netdev_link(vport, parms->name, parms->bridge_name); +#else return ovs_netdev_link(vport, parms->name); +#endif } static struct vport_ops ovs_gre_vport_ops = {