aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2009-10-26 11:35:44 +0000
committerImre Kaloz <kaloz@openwrt.org>2009-10-26 11:35:44 +0000
commit3dd87b893af81fa8ef4200770e0ce97f0d572b45 (patch)
tree1b62993383a457aac55b8c7bb696b800499cb37b
parent4d1bd56f33944d6c6479335f15427b0542a03b94 (diff)
downloadupstream-3dd87b893af81fa8ef4200770e0ce97f0d572b45.tar.gz
upstream-3dd87b893af81fa8ef4200770e0ce97f0d572b45.tar.bz2
upstream-3dd87b893af81fa8ef4200770e0ce97f0d572b45.zip
since we are using newer iptables version, we don't need this patch anymore
SVN-Revision: 18162
-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 462147b6db..0000000000
--- 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 462147b6db..0000000000
--- 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_ */
-