Update to .21

[openwrt.git] / target / linux / brcm63xx-2.6 / patches / 100-atm_hacks.patch

diff --git a/target/linux/brcm63xx-2.6/patches/100-atm_hacks.patch b/target/linux/brcm63xx-2.6/patches/100-atm_hacks.patch
index b0afadd..7535c22 100644 (file)
--- a/target/linux/brcm63xx-2.6/patches/100-atm_hacks.patch
+++ b/target/linux/brcm63xx-2.6/patches/100-atm_hacks.patch
@@ -74,7 +74,7 @@ diff -urN linux-2.6.19.1/include/linux/atmdev.h linux-2.6.19.1.new/include/linux
        void            *dev_data;      /* per-device data */
        void            *proto_data;    /* per-protocol data */
        struct k_atm_aal_stats *stats;  /* pointer to AAL stats group */
-+#if defined(CONFIG_MIP_BCM963XX)
++#if defined(CONFIG_MIPS_BCM963XX)
 +      struct sock     *sk;            /* socket backpointer */
 +#endif
        /* SVC part --- may move later ------------------------------------- */
@@ -184,55 +184,3 @@ diff -urN linux-2.6.19.1/include/linux/atmdev.h linux-2.6.19.1.new/include/linux
  }
  
  
-diff -urN linux-2.6.19.1/include/linux/atmrt2684.h linux-2.6.19.1.new/include/linux/atmrt2684.h
---- linux-2.6.19.1/include/linux/atmrt2684.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.19.1.new/include/linux/atmrt2684.h       2007-01-07 18:40:39.000000000 +0100
-@@ -0,0 +1,48 @@
-+#ifndef _LINUX_ATMRT2684_H
-+#define _LINUX_ATMRT2684_H
-+
-+#include <linux/atm.h>
-+#include <linux/if.h>         /* For IFNAMSIZ */
-+
-+#define RT2684_ENCAPS_NULL    (0)     /* VC-mux */
-+#define RT2684_ENCAPS_LLC     (1)
-+#define RT2684_ENCAPS_AUTODETECT (2)  /* Unsuported */
-+
-+/*
-+ * This is for the ATM_NEWBACKENDIF call - these are like socket families:
-+ * the first element of the structure is the backend number and the rest
-+ * is per-backend specific
-+ */
-+struct atm_newif_rt2684 {
-+      atm_backend_t   backend_num;    /* ATM_BACKEND_RT2684 */
-+      char            ifname[IFNAMSIZ];
-+};
-+
-+/*
-+ * This structure is used to specify a rt2684 interface - either by a
-+ * positive integer (returned by ATM_NEWBACKENDIF) or the interfaces name
-+ */
-+#define RT2684_FIND_BYNOTHING (0)
-+#define RT2684_FIND_BYNUM     (1)
-+#define RT2684_FIND_BYIFNAME  (2)
-+struct rt2684_if_spec {
-+      int method;                     /* RT2684_FIND_* */
-+      union {
-+              char            ifname[IFNAMSIZ];
-+              int             devnum;
-+      } spec;
-+};
-+
-+/*
-+ * This is for the ATM_SETBACKEND call - these are like socket families:
-+ * the first element of the structure is the backend number and the rest
-+ * is per-backend specific
-+ */
-+struct atm_backend_rt2684 {
-+      atm_backend_t   backend_num;    /* ATM_BACKEND_RT2684 */
-+      struct rt2684_if_spec ifspec;
-+      unsigned char   encaps;         /* RT2684_ENCAPS_* */
-+};
-+
-+
-+#endif /* _LINUX_ATMRT2684_H */