X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fnetwork%2Futils%2Fipset%2Fpatches%2F001-timeout-size.patch;fp=package%2Fnetwork%2Futils%2Fipset%2Fpatches%2F001-timeout-size.patch;h=0000000000000000000000000000000000000000;hp=b9ff4e256df5e6609c60b4437089988657a28329;hb=3207bd5f87016682a90650c0c09f6f2131b625ab;hpb=35ccee259af307398de250e091fe1536393cb737

diff --git a/package/network/utils/ipset/patches/001-timeout-size.patch b/package/network/utils/ipset/patches/001-timeout-size.patch
deleted file mode 100644
index b9ff4e256d..0000000000
--- a/package/network/utils/ipset/patches/001-timeout-size.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/lib/parse.c b/lib/parse.c
-index 8ea8542..440ef8f 100644
---- a/lib/parse.c
-+++ b/lib/parse.c
-@@ -1292,15 +1292,20 @@ ipset_parse_timeout(struct ipset_session *session,
- 		    enum ipset_opt opt, const char *str)
- {
- 	int err;
--	unsigned long long num = 0;
-+	unsigned long long llnum = 0;
-+	uint32_t num = 0;
- 
- 	assert(session);
- 	assert(opt == IPSET_OPT_TIMEOUT);
- 	assert(str);
- 
--	err = string_to_number_ll(session, str, 0, UINT_MAX/1000, &num);
--	if (err == 0)
-+	err = string_to_number_ll(session, str, 0, UINT_MAX/1000, &llnum);
-+	if (err == 0) {
-+		/* Timeout is expected to be 32bits wide, so we have
-+		   to convert it here */
-+		num = llnum;
- 		return ipset_session_data_set(session, opt, &num);
-+	}
- 
- 	return err;
- }