mirror of
https://github.com/breeze303/nss-packages.git
synced 2025-12-16 08:44:52 +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.
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
--- a/gre/nss_connmgr_gre_v6.c
|
|
+++ b/gre/nss_connmgr_gre_v6.c
|
|
@@ -95,7 +95,8 @@ static int nss_connmgr_gre_v6_get_mac_ad
|
|
/*
|
|
* Find src MAC address
|
|
*/
|
|
- local_dev = (struct net_device *)ipv6_dev_find(&init_net, &src_addr, 1);
|
|
+ local_dev = NULL;
|
|
+ local_dev = (struct net_device *)ipv6_dev_find(&init_net, &src_addr, local_dev);
|
|
if (!local_dev) {
|
|
nss_connmgr_gre_warning("Unable to find local dev for %pI6", src_ip);
|
|
return GRE_ERR_NO_LOCAL_NETDEV;
|
|
--- a/gre/test/nss_connmgr_gre_test.c
|
|
+++ b/gre/test/nss_connmgr_gre_test.c
|
|
@@ -229,10 +229,12 @@ static int nss_connmgr_gre_test_open_pro
|
|
/*
|
|
* Proc ops
|
|
*/
|
|
-static const struct file_operations nss_connmgr_gre_test_proc_ops = {
|
|
- .open = nss_connmgr_gre_test_open_proc,
|
|
- .write = nss_connmgr_gre_test_write_proc,
|
|
- .read = seq_read,
|
|
+static const struct proc_ops nss_connmgr_gre_test_proc_ops = {
|
|
+ .proc_open = nss_connmgr_gre_test_open_proc,
|
|
+ .proc_read = seq_read,
|
|
+ .proc_lseek = seq_lseek,
|
|
+ .proc_release = single_release,
|
|
+ .proc_write = nss_connmgr_gre_test_write_proc,
|
|
};
|
|
|
|
/*
|