revert an upstream change to retain compatibility with iptables 1.4.0

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11326 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/generic-2.6/patches-2.6.26/950-revert_xt_sctp_simplify.patch b/target/linux/generic-2.6/patches-2.6.26/950-revert_xt_sctp_simplify.patch
new file mode 100644 (file)
index 0000000..6c8cdf1
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.26/950-revert_xt_sctp_simplify.patch
@@ -0,0 +1,103 @@
+--- linux-2.6.26-rc4/include/linux/netfilter/xt_sctp.h 2008-05-26 20:08:11.000000000 +0200
++++ linux-2.6.26-rc4-owrt/include/linux/netfilter/xt_sctp.h    2008-06-02 13:30:15.000000000 +0200
+@@ -37,54 +37,68 @@
+ 
+ #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_ */
+