summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-10-26 11:35:44 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-10-26 11:35:44 +0000
commit8bea5a1f5474293566f3859cc958667c646eb2f7 (patch)
treeb5ace0615a3afc7d83df2c215aec84061c753800
parentca1329b26cbf56d82efc682347f07f765d7f2dd6 (diff)
since we are using newer iptables version, we don't need this patch anymore
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18162 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/950-revert_xt_sctp_simplify.patch103
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/950-revert_xt_sctp_simplify.patch103
2 files changed, 0 insertions, 206 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.27/950-revert_xt_sctp_simplify.patch b/target/linux/generic-2.6/patches-2.6.27/950-revert_xt_sctp_simplify.patch
deleted file mode 100644
index 462147b6d..000000000
--- a/target/linux/generic-2.6/patches-2.6.27/950-revert_xt_sctp_simplify.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- a/include/linux/netfilter/xt_sctp.h
-+++ b/include/linux/netfilter/xt_sctp.h
-@@ -37,54 +37,68 @@ struct xt_sctp_info {
-
- #define SCTP_CHUNKMAP_SET(chunkmap, type) \
- do { \
-- (chunkmap)[type / bytes(u_int32_t)] |= \
-+ chunkmap[type / bytes(u_int32_t)] |= \
- 1 << (type % bytes(u_int32_t)); \
- } while (0)
-
- #define SCTP_CHUNKMAP_CLEAR(chunkmap, type) \
- do { \
-- (chunkmap)[type / bytes(u_int32_t)] &= \
-+ chunkmap[type / bytes(u_int32_t)] &= \
- ~(1 << (type % bytes(u_int32_t))); \
- } while (0)
-
- #define SCTP_CHUNKMAP_IS_SET(chunkmap, type) \
- ({ \
-- ((chunkmap)[type / bytes (u_int32_t)] & \
-+ (chunkmap[type / bytes (u_int32_t)] & \
- (1 << (type % bytes (u_int32_t)))) ? 1: 0; \
- })
-
--#define SCTP_CHUNKMAP_RESET(chunkmap) \
-- memset((chunkmap), 0, sizeof(chunkmap))
-+#define SCTP_CHUNKMAP_RESET(chunkmap) \
-+ do { \
-+ int i; \
-+ for (i = 0; i < ARRAY_SIZE(chunkmap); i++) \
-+ chunkmap[i] = 0; \
-+ } while (0)
-
--#define SCTP_CHUNKMAP_SET_ALL(chunkmap) \
-- memset((chunkmap), ~0U, sizeof(chunkmap))
-+#define SCTP_CHUNKMAP_SET_ALL(chunkmap) \
-+ do { \
-+ int i; \
-+ for (i = 0; i < ARRAY_SIZE(chunkmap); i++) \
-+ chunkmap[i] = ~0; \
-+ } while (0)
-
--#define SCTP_CHUNKMAP_COPY(destmap, srcmap) \
-- memcpy((destmap), (srcmap), sizeof(srcmap))
-+#define SCTP_CHUNKMAP_COPY(destmap, srcmap) \
-+ do { \
-+ int i; \
-+ for (i = 0; i < ARRAY_SIZE(srcmap); i++) \
-+ destmap[i] = srcmap[i]; \
-+ } while (0)
-+
-+#define SCTP_CHUNKMAP_IS_CLEAR(chunkmap) \
-+({ \
-+ int i; \
-+ int flag = 1; \
-+ for (i = 0; i < ARRAY_SIZE(chunkmap); i++) { \
-+ if (chunkmap[i]) { \
-+ flag = 0; \
-+ break; \
-+ } \
-+ } \
-+ flag; \
-+})
-
--#define SCTP_CHUNKMAP_IS_CLEAR(chunkmap) \
-- __sctp_chunkmap_is_clear((chunkmap), ARRAY_SIZE(chunkmap))
--static inline bool
--__sctp_chunkmap_is_clear(const u_int32_t *chunkmap, unsigned int n)
--{
-- unsigned int i;
-- for (i = 0; i < n; ++i)
-- if (chunkmap[i])
-- return false;
-- return true;
--}
--
--#define SCTP_CHUNKMAP_IS_ALL_SET(chunkmap) \
-- __sctp_chunkmap_is_all_set((chunkmap), ARRAY_SIZE(chunkmap))
--static inline bool
--__sctp_chunkmap_is_all_set(const u_int32_t *chunkmap, unsigned int n)
--{
-- unsigned int i;
-- for (i = 0; i < n; ++i)
-- if (chunkmap[i] != ~0U)
-- return false;
-- return true;
--}
-+#define SCTP_CHUNKMAP_IS_ALL_SET(chunkmap) \
-+({ \
-+ int i; \
-+ int flag = 1; \
-+ for (i = 0; i < ARRAY_SIZE(chunkmap); i++) { \
-+ if (chunkmap[i] != ~0) { \
-+ flag = 0; \
-+ break; \
-+ } \
-+ } \
-+ flag; \
-+})
-
- #endif /* _XT_SCTP_H_ */
-
diff --git a/target/linux/generic-2.6/patches-2.6.28/950-revert_xt_sctp_simplify.patch b/target/linux/generic-2.6/patches-2.6.28/950-revert_xt_sctp_simplify.patch
deleted file mode 100644
index 462147b6d..000000000
--- a/target/linux/generic-2.6/patches-2.6.28/950-revert_xt_sctp_simplify.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- a/include/linux/netfilter/xt_sctp.h
-+++ b/include/linux/netfilter/xt_sctp.h
-@@ -37,54 +37,68 @@ struct xt_sctp_info {
-
- #define SCTP_CHUNKMAP_SET(chunkmap, type) \
- do { \
-- (chunkmap)[type / bytes(u_int32_t)] |= \
-+ chunkmap[type / bytes(u_int32_t)] |= \
- 1 << (type % bytes(u_int32_t)); \
- } while (0)
-
- #define SCTP_CHUNKMAP_CLEAR(chunkmap, type) \
- do { \
-- (chunkmap)[type / bytes(u_int32_t)] &= \
-+ chunkmap[type / bytes(u_int32_t)] &= \
- ~(1 << (type % bytes(u_int32_t))); \
- } while (0)
-
- #define SCTP_CHUNKMAP_IS_SET(chunkmap, type) \
- ({ \
-- ((chunkmap)[type / bytes (u_int32_t)] & \
-+ (chunkmap[type / bytes (u_int32_t)] & \
- (1 << (type % bytes (u_int32_t)))) ? 1: 0; \
- })
-
--#define SCTP_CHUNKMAP_RESET(chunkmap) \
-- memset((chunkmap), 0, sizeof(chunkmap))
-+#define SCTP_CHUNKMAP_RESET(chunkmap) \
-+ do { \
-+ int i; \
-+ for (i = 0; i < ARRAY_SIZE(chunkmap); i++) \
-+ chunkmap[i] = 0; \
-+ } while (0)
-
--#define SCTP_CHUNKMAP_SET_ALL(chunkmap) \
-- memset((chunkmap), ~0U, sizeof(chunkmap))
-+#define SCTP_CHUNKMAP_SET_ALL(chunkmap) \
-+ do { \
-+ int i; \
-+ for (i = 0; i < ARRAY_SIZE(chunkmap); i++) \
-+ chunkmap[i] = ~0; \
-+ } while (0)
-
--#define SCTP_CHUNKMAP_COPY(destmap, srcmap) \
-- memcpy((destmap), (srcmap), sizeof(srcmap))
-+#define SCTP_CHUNKMAP_COPY(destmap, srcmap) \
-+ do { \
-+ int i; \
-+ for (i = 0; i < ARRAY_SIZE(srcmap); i++) \
-+ destmap[i] = srcmap[i]; \
-+ } while (0)
-+
-+#define SCTP_CHUNKMAP_IS_CLEAR(chunkmap) \
-+({ \
-+ int i; \
-+ int flag = 1; \
-+ for (i = 0; i < ARRAY_SIZE(chunkmap); i++) { \
-+ if (chunkmap[i]) { \
-+ flag = 0; \
-+ break; \
-+ } \
-+ } \
-+ flag; \
-+})
-
--#define SCTP_CHUNKMAP_IS_CLEAR(chunkmap) \
-- __sctp_chunkmap_is_clear((chunkmap), ARRAY_SIZE(chunkmap))
--static inline bool
--__sctp_chunkmap_is_clear(const u_int32_t *chunkmap, unsigned int n)
--{
-- unsigned int i;
-- for (i = 0; i < n; ++i)
-- if (chunkmap[i])
-- return false;
-- return true;
--}
--
--#define SCTP_CHUNKMAP_IS_ALL_SET(chunkmap) \
-- __sctp_chunkmap_is_all_set((chunkmap), ARRAY_SIZE(chunkmap))
--static inline bool
--__sctp_chunkmap_is_all_set(const u_int32_t *chunkmap, unsigned int n)
--{
-- unsigned int i;
-- for (i = 0; i < n; ++i)
-- if (chunkmap[i] != ~0U)
-- return false;
-- return true;
--}
-+#define SCTP_CHUNKMAP_IS_ALL_SET(chunkmap) \
-+({ \
-+ int i; \
-+ int flag = 1; \
-+ for (i = 0; i < ARRAY_SIZE(chunkmap); i++) { \
-+ if (chunkmap[i] != ~0) { \
-+ flag = 0; \
-+ break; \
-+ } \
-+ } \
-+ flag; \
-+})
-
- #endif /* _XT_SCTP_H_ */
-