remove ipset support from core, it is now provided by xtables-addons from the package...

[openwrt.git] / target / linux / generic-2.4 / patches / 224-atm_hotplug.patch

diff --git a/target/linux/generic-2.4/patches/224-atm_hotplug.patch b/target/linux/generic-2.4/patches/224-atm_hotplug.patch
index c431d8c..b1238ed 100644 (file)
--- a/target/linux/generic-2.4/patches/224-atm_hotplug.patch
+++ b/target/linux/generic-2.4/patches/224-atm_hotplug.patch
@@ -1,7 +1,6 @@
-diff -urN linux.old/include/linux/atmdev.h linux.dev/include/linux/atmdev.h
---- linux.old/include/linux/atmdev.h   2005-11-17 12:51:55.883585000 +0100
-+++ linux.dev/include/linux/atmdev.h   2005-11-17 13:49:22.012671000 +0100
-@@ -408,6 +408,7 @@
+--- a/include/linux/atmdev.h
++++ b/include/linux/atmdev.h
+@@ -400,6 +400,7 @@ extern rwlock_t vcc_sklist_lock;

  struct atm_dev *atm_dev_register(const char *type,const struct atmdev_ops *ops,
      int number,atm_dev_flags_t *flags); /* number == -1: pick first available */
  struct atm_dev *atm_dev_lookup(int number);
  struct atm_dev *atm_dev_register(const char *type,const struct atmdev_ops *ops,
      int number,atm_dev_flags_t *flags); /* number == -1: pick first available */
  struct atm_dev *atm_dev_lookup(int number);


@@ -9,9 +8,8 @@ diff -urN linux.old/include/linux/atmdev.h linux.dev/include/linux/atmdev.h
  void atm_dev_deregister(struct atm_dev *dev);
  void shutdown_atm_dev(struct atm_dev *dev);
  void vcc_insert_socket(struct sock *sk);
  void atm_dev_deregister(struct atm_dev *dev);
  void shutdown_atm_dev(struct atm_dev *dev);
  void vcc_insert_socket(struct sock *sk);

-diff -urN linux.old/net/atm/resources.c linux.dev/net/atm/resources.c
---- linux.old/net/atm/resources.c      2003-11-28 19:26:21.000000000 +0100
-+++ linux.dev/net/atm/resources.c      2005-11-17 14:27:26.514267750 +0100
+--- a/net/atm/resources.c
++++ b/net/atm/resources.c

 @@ -10,6 +10,7 @@
  #include <linux/sonet.h>
  #include <linux/kernel.h> /* for barrier */
 @@ -10,6 +10,7 @@
  #include <linux/sonet.h>
  #include <linux/kernel.h> /* for barrier */


@@ -20,7 +18,7 @@ diff -urN linux.old/net/atm/resources.c linux.dev/net/atm/resources.c
  #include <linux/bitops.h>
  #include <net/sock.h>  /* for struct sock */
  #include <asm/segment.h> /* for get_fs_long and put_fs_long */
  #include <linux/bitops.h>
  #include <net/sock.h>  /* for struct sock */
  #include <asm/segment.h> /* for get_fs_long and put_fs_long */

-@@ -70,6 +71,44 @@
+@@ -70,6 +71,44 @@ struct atm_dev *atm_dev_lookup(int numbe

        return dev;
  }
  
        return dev;
  }
  


@@ -65,7 +63,7 @@ diff -urN linux.old/net/atm/resources.c linux.dev/net/atm/resources.c
  struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops,
                                 int number, atm_dev_flags_t *flags)
  {
  struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops,
                                 int number, atm_dev_flags_t *flags)
  {

-@@ -123,7 +162,10 @@
+@@ -123,7 +162,10 @@ struct atm_dev *atm_dev_register(const c

                }
        }
  #endif
                }
        }
  #endif


@@ -77,7 +75,7 @@ diff -urN linux.old/net/atm/resources.c linux.dev/net/atm/resources.c
        return dev;
  }
  
        return dev;
  }
  

-@@ -131,6 +173,10 @@
+@@ -131,6 +173,10 @@ struct atm_dev *atm_dev_register(const c

  void atm_dev_deregister(struct atm_dev *dev)
  {
        unsigned long warning_time;
  void atm_dev_deregister(struct atm_dev *dev)
  {
        unsigned long warning_time;


@@ -88,7 +86,7 @@ diff -urN linux.old/net/atm/resources.c linux.dev/net/atm/resources.c
  
  #ifdef CONFIG_PROC_FS
        if (dev->ops->proc_read)
  
  #ifdef CONFIG_PROC_FS
        if (dev->ops->proc_read)

-@@ -399,6 +445,7 @@
+@@ -399,6 +445,7 @@ done:

  }
  
  
  }