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.
30 lines
769 B
Diff
30 lines
769 B
Diff
--- a/bridge/nss_bridge_mgr.c
|
|
+++ b/bridge/nss_bridge_mgr.c
|
|
@@ -1098,8 +1098,10 @@ int nss_bridge_mgr_register_br(struct ne
|
|
*/
|
|
b_pvt->ifnum = ifnum;
|
|
b_pvt->mtu = dev->mtu;
|
|
+#if defined(NSS_BRIDGE_MGR_PPE_SUPPORT)
|
|
b_pvt->wan_if_num = -1;
|
|
b_pvt->wan_if_enabled = false;
|
|
+#endif
|
|
ether_addr_copy(b_pvt->dev_addr, dev->dev_addr);
|
|
spin_lock(&br_mgr_ctx.lock);
|
|
list_add(&b_pvt->list, &br_mgr_ctx.list);
|
|
@@ -1165,6 +1167,7 @@ static int nss_bridge_mgr_bond_slave_cha
|
|
return NOTIFY_DONE;
|
|
}
|
|
|
|
+#if defined(NSS_BRIDGE_MGR_PPE_SUPPORT)
|
|
/*
|
|
* Add or remove the slave based based on linking event
|
|
*/
|
|
@@ -1179,6 +1182,7 @@ static int nss_bridge_mgr_bond_slave_cha
|
|
cu_info->upper_dev->name, master->name);
|
|
}
|
|
}
|
|
+#endif
|
|
|
|
return NOTIFY_DONE;
|
|
}
|