mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 14:23:38 +00:00
49 lines
1.2 KiB
Diff
49 lines
1.2 KiB
Diff
--- a/vlan/nss_vlan_mgr.c
|
|
+++ b/vlan/nss_vlan_mgr.c
|
|
@@ -820,8 +820,10 @@ static struct nss_vlan_pvt *nss_vlan_mgr
|
|
*/
|
|
static void nss_vlan_mgr_instance_free(struct nss_vlan_pvt *v)
|
|
{
|
|
+#ifdef NSS_VLAN_MGR_PPE_SUPPORT
|
|
int32_t i;
|
|
int ret = 0;
|
|
+#endif
|
|
|
|
spin_lock(&vlan_mgr_ctx.lock);
|
|
BUG_ON(--v->refs);
|
|
@@ -979,8 +981,11 @@ static int nss_vlan_mgr_register_event(s
|
|
int ret;
|
|
#endif
|
|
uint32_t vlan_tag;
|
|
+#ifdef NSS_VLAN_MGR_PPE_SUPPORT
|
|
struct net_device *slave;
|
|
- int32_t port, port_if;
|
|
+ int32_t port;
|
|
+#endif
|
|
+ int32_t port_if;
|
|
struct vlan_dev_priv *vlan;
|
|
struct net_device *real_dev;
|
|
bool is_bond_master = false;
|
|
@@ -1354,8 +1359,10 @@ return_with_error:
|
|
int nss_vlan_mgr_join_bridge(struct net_device *dev, uint32_t bridge_vsi)
|
|
{
|
|
struct nss_vlan_pvt *v = nss_vlan_mgr_instance_find_and_ref(dev);
|
|
+#ifdef NSS_VLAN_MGR_PPE_SUPPORT
|
|
struct net_device *real_dev;
|
|
int ret;
|
|
+#endif
|
|
|
|
if (!v)
|
|
return 0;
|
|
@@ -1415,8 +1422,10 @@ EXPORT_SYMBOL(nss_vlan_mgr_join_bridge);
|
|
int nss_vlan_mgr_leave_bridge(struct net_device *dev, uint32_t bridge_vsi)
|
|
{
|
|
struct nss_vlan_pvt *v = nss_vlan_mgr_instance_find_and_ref(dev);
|
|
+#ifdef NSS_VLAN_MGR_PPE_SUPPORT
|
|
struct net_device *real_dev;
|
|
int ret;
|
|
+#endif
|
|
|
|
if (!v)
|
|
return 0;
|