- merged into 2.6.4-wrr.patch.

Changed files:
    2.6.7-ppc-proxydict-workaround.patch -> 1.1.2.2

diff --git a/2.6.7-ppc-proxydict-workaround.patch b/2.6.7-ppc-proxydict-workaround.patch
deleted file mode 100644 (file)
index 6d052d6..0000000
--- a/2.6.7-ppc-proxydict-workaround.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- linux-2.6.7/net/sched/proxydict.c.orig     2004-07-06 22:03:48.000000000 +0200
-+++ linux-2.6.7/net/sched/proxydict.c  2004-07-07 01:20:29.238093104 +0200
-@@ -18,7 +18,7 @@
- // Size of hash table given maximal number of connections:
- #define hash_size_max_con(max_con) (2*(max_con))
- 
--// The memory area we maintain:
-+// The __proxydict_memory area we maintain:
- typedef struct {
-   int hash_size;
-   int max_con;
-@@ -38,20 +38,20 @@
-   //
-   //   The entries in next not allocated is also in linked list where 
-   //   the first free index is free_first.
--} memory;  
-+} __proxydict_memory;  
- 
--#define Memory(m)     ((memory*)m)
--#define Hash_table(m) ((int*)(((char*)m)+sizeof(memory)))
--#define Next(m)       ((int*)(((char*)m)+sizeof(memory)+     \
--                       sizeof(int)*((memory*)m)->hash_size))
-+#define Memory(m)     ((__proxydict_memory*)m)
-+#define Hash_table(m) ((int*)(((char*)m)+sizeof(__proxydict_memory)))
-+#define Next(m)       ((int*)(((char*)m)+sizeof(__proxydict_memory)+     \
-+                       sizeof(int)*((__proxydict_memory*)m)->hash_size))
- #define Info(m)       ((ProxyRemapBlock*)(((char*)m)+                          \
--                                           sizeof(memory)+                     \
--                                           sizeof(int)*((memory*)m)->hash_size+\
--                                         sizeof(int)*((memory*)m)->max_con   \
-+                                           sizeof(__proxydict_memory)+                     \
-+                                           sizeof(int)*((__proxydict_memory*)m)->hash_size+\
-+                                         sizeof(int)*((__proxydict_memory*)m)->max_con   \
-                                         ))
- 
- int proxyGetMemSize(int max_con) {
--  return sizeof(memory)+
-+  return sizeof(__proxydict_memory)+
-          sizeof(int)*hash_size_max_con(max_con)+
-        sizeof(int)*max_con+
-        sizeof(ProxyRemapBlock)*max_con;
-@@ -59,7 +59,7 @@
- 
- void proxyInitMem(void* data, int max_con) {
-   // Init m:
--  memory* m=Memory(data);
-+  __proxydict_memory* m=Memory(data);
-   m->max_con=max_con;
-   m->cur_con=0;
-   m->hash_size=hash_size_max_con(max_con);
-@@ -88,7 +88,7 @@
- }
- 
- ProxyRemapBlock* proxyLookup(void* data, unsigned ipaddr, unsigned short port, char proto) {    
--  memory* m=Memory(data);
-+  __proxydict_memory* m=Memory(data);
-   int* hash_table=Hash_table(m);
-   int* next=Next(m);
-   ProxyRemapBlock* info=Info(m);
-@@ -104,7 +104,7 @@
- }    
- 
- int proxyConsumeBlock(void* data, ProxyRemapBlock* blk) {
--  memory* m=Memory(data);
-+  __proxydict_memory* m=Memory(data);
-   int* hash_table=Hash_table(m);
-   int* next=Next(m);
-   ProxyRemapBlock* info=Info(m);