diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-12-10 09:53:51 +0000 |
|---|---|---|
| committer | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-12-10 09:57:19 +0000 |
| commit | 18e02fa20c949e17ff77d821e464a44640ca4c52 (patch) | |
| tree | a0eb32c16097721ef67ce161fddc7f4c27df71cb /package/network/services/dnsmasq/patches/110-ipset-remove-old-kernel-support.patch | |
| parent | a6a8fe0be5cd2edb1560bfc3f3094c3d34f2d2b0 (diff) | |
| download | upstream-18e02fa20c949e17ff77d821e464a44640ca4c52.tar.gz upstream-18e02fa20c949e17ff77d821e464a44640ca4c52.tar.bz2 upstream-18e02fa20c949e17ff77d821e464a44640ca4c52.zip | |
Revert "dnsmasq: follow upstream dnsmasq pre-v2.81"
This reverts commit a6a8fe0be5cd2edb1560bfc3f3094c3d34f2d2b0.
buildbot found an error
option.c: In function 'dhcp_context_free':
option.c:1042:15: error: 'struct dhcp_context' has no member named 'template_interface'
free(ctx->template_interface);
revert for the moment
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'package/network/services/dnsmasq/patches/110-ipset-remove-old-kernel-support.patch')
| -rw-r--r-- | package/network/services/dnsmasq/patches/110-ipset-remove-old-kernel-support.patch | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/package/network/services/dnsmasq/patches/110-ipset-remove-old-kernel-support.patch b/package/network/services/dnsmasq/patches/110-ipset-remove-old-kernel-support.patch index f2681e3993..88e334b0fc 100644 --- a/package/network/services/dnsmasq/patches/110-ipset-remove-old-kernel-support.patch +++ b/package/network/services/dnsmasq/patches/110-ipset-remove-old-kernel-support.patch @@ -44,7 +44,7 @@ (buffer = safe_malloc(BUFF_SZ)) && (ipset_sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER)) != -1 && (bind(ipset_sock, (struct sockaddr *)&snl, sizeof(snl)) != -1)) -@@ -211,16 +192,9 @@ int add_to_ipset(const char *setname, co +@@ -217,17 +198,10 @@ int add_to_ipset(const char *setname, co if (flags & F_IPV6) { af = AF_INET6; @@ -55,6 +55,7 @@ - ret = -1; - } } + #endif - if (ret != -1) - ret = old_kernel ? old_add_to_ipset(setname, ipaddr, remove) : new_add_to_ipset(setname, ipaddr, af, remove); |