Separate ipset errnos completely from system ones and bump protocol version.

diff --git a/include/libipset/linux_ip_set.h b/include/libipset/linux_ip_set.h
index 1fb7ea23219389808d80e52c7d94e69e18569892..d81a811cd0b5e53f3601305a163bc0601e74d5bc 100644 (file)
--- a/include/libipset/linux_ip_set.h
+++ b/include/libipset/linux_ip_set.h
@@ -4,7 +4,7 @@
 /* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
  *                         Patrick Schaaf <bof@bof.de>
  *                         Martin Josefsson <gandalf@wlug.westbo.se>
- * Copyright (C) 2003-2010 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ * Copyright (C) 2003-2011 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -12,7 +12,7 @@
  */
 
 /* The protocol version */
-#define IPSET_PROTOCOL         5
+#define IPSET_PROTOCOL         6
 
 /* The max length of strings including NUL: set and type identifiers */
 #define IPSET_MAXNAMELEN       32
@@ -118,7 +118,7 @@ enum {
 
 /* Error codes */
 enum ipset_errno {
-       IPSET_ERR_PRIVATE = 128,
+       IPSET_ERR_PRIVATE = 4096,
        IPSET_ERR_PROTOCOL,
        IPSET_ERR_FIND_TYPE,
        IPSET_ERR_MAX_SETS,
@@ -135,7 +135,7 @@ enum ipset_errno {
        IPSET_ERR_IPADDR_IPV6,
 
        /* Type specific error codes */
-       IPSET_ERR_TYPE_SPECIFIC = 160,
+       IPSET_ERR_TYPE_SPECIFIC = 4352,
 };
 
 /* Flags at command level */

diff --git a/kernel/include/linux/netfilter/ipset/ip_set.h b/kernel/include/linux/netfilter/ipset/ip_set.h
index 88e561cf5b28fb1a5773a259ee2f515b631d6426..ec333d83f3b4abdc62e912152838fa3131987220 100644 (file)
--- a/kernel/include/linux/netfilter/ipset/ip_set.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set.h
@@ -12,7 +12,7 @@
  */
 
 /* The protocol version */
-#define IPSET_PROTOCOL         5
+#define IPSET_PROTOCOL         6
 
 /* The max length of strings including NUL: set and type identifiers */
 #define IPSET_MAXNAMELEN       32
@@ -118,7 +118,7 @@ enum {
 
 /* Error codes */
 enum ipset_errno {
-       IPSET_ERR_PRIVATE = 128,
+       IPSET_ERR_PRIVATE = 4096,
        IPSET_ERR_PROTOCOL,
        IPSET_ERR_FIND_TYPE,
        IPSET_ERR_MAX_SETS,
@@ -135,7 +135,7 @@ enum ipset_errno {
        IPSET_ERR_IPADDR_IPV6,
 
        /* Type specific error codes */
-       IPSET_ERR_TYPE_SPECIFIC = 160,
+       IPSET_ERR_TYPE_SPECIFIC = 4352,
 };
 
 /* Flags at command level */