mirror of
https://github.com/qosmio/nss-packages.git
synced 2025-12-17 00:33:40 +00:00
7329a4f74d
There are significant changes between NSS version 11.4.0.5 and 12.1 (12.0.5), that it doesn't really make sense to use it with older firmware (i.e. using mesh releated features). This change will explicitly link building the proper driver and client packages when FW 12.1 or 11.4 is selected, while also backporting patches from 12.4.
60 lines
1.5 KiB
Diff
60 lines
1.5 KiB
Diff
--- a/vlan/nss_vlan_mgr.c
|
|
+++ b/vlan/nss_vlan_mgr.c
|
|
@@ -800,8 +800,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);
|
|
@@ -961,8 +963,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;
|
|
@@ -1355,8 +1360,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;
|
|
@@ -1416,8 +1423,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;
|
|
--- a/vlan/Makefile
|
|
+++ b/vlan/Makefile
|
|
@@ -8,7 +8,7 @@ ifeq ($(SoC),$(filter $(SoC),ipq807x ipq
|
|
ccflags-y += -DNSS_VLAN_MGR_PPE_SUPPORT
|
|
endif
|
|
|
|
-ccflags-y += -DNSS_VLAN_MGR_DEBUG_LEVEL=0
|
|
+ccflags-y += -DNSS_VLAN_MGR_DEBUG_LEVEL=4
|
|
ccflags-y += -Wall -Werror
|
|
|
|
ifneq (,$(filter $(CONFIG_BONDING),y m))
|