[kernel] Refresh patches.

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

diff --git a/target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch
index 0814520..a31bb2b 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch
@@ -569,7 +569,7 @@
 +
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
 +
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig

-@@ -109,6 +109,129 @@
+@@ -109,6 +109,129 @@ config EQUALIZER

          To compile this driver as a module, choose M here: the module
          will be called eql.  If unsure, say N.
  
          To compile this driver as a module, choose M here: the module
          will be called eql.  If unsure, say N.
  


@@ -701,7 +701,7 @@
        select CRC32
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile
        select CRC32
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile

-@@ -144,6 +144,7 @@
+@@ -144,6 +144,7 @@ obj-$(CONFIG_SLHC) += slhc.o

  obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
  
  obj-$(CONFIG_DUMMY) += dummy.o
  obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
  
  obj-$(CONFIG_DUMMY) += dummy.o


@@ -763,7 +763,7 @@
  
  #define HAVE_ALLOC_SKB                /* For the drivers to know */
  #define HAVE_ALIGNABLE_SKB    /* Ditto 8)                */
  
  #define HAVE_ALLOC_SKB                /* For the drivers to know */
  #define HAVE_ALIGNABLE_SKB    /* Ditto 8)                */

-@@ -272,6 +275,9 @@
+@@ -272,6 +275,9 @@ struct sk_buff {

         * first. This is owned by whoever has the skb queued ATM.
         */
        char                    cb[48];
         * first. This is owned by whoever has the skb queued ATM.
         */
        char                    cb[48];


@@ -773,7 +773,7 @@
  
        unsigned int            len,
                                data_len;
  
        unsigned int            len,
                                data_len;

-@@ -302,6 +308,9 @@
+@@ -302,6 +308,9 @@ struct sk_buff {

        struct nf_conntrack     *nfct;
        struct sk_buff          *nfct_reasm;
  #endif
        struct nf_conntrack     *nfct;
        struct sk_buff          *nfct_reasm;
  #endif


@@ -783,7 +783,7 @@
  #ifdef CONFIG_BRIDGE_NETFILTER
        struct nf_bridge_info   *nf_bridge;
  #endif
  #ifdef CONFIG_BRIDGE_NETFILTER
        struct nf_bridge_info   *nf_bridge;
  #endif

-@@ -321,6 +330,9 @@
+@@ -321,6 +330,9 @@ struct sk_buff {

        __u8                    do_not_encrypt:1;
  #endif
        /* 0/13/14 bit hole */
        __u8                    do_not_encrypt:1;
  #endif
        /* 0/13/14 bit hole */


@@ -793,7 +793,7 @@
  
  #ifdef CONFIG_NET_DMA
        dma_cookie_t            dma_cookie;
  
  #ifdef CONFIG_NET_DMA
        dma_cookie_t            dma_cookie;

-@@ -353,6 +365,12 @@
+@@ -353,6 +365,12 @@ struct sk_buff {

  
  #include <asm/system.h>
  
  
  #include <asm/system.h>
  


@@ -806,7 +806,7 @@
  extern void kfree_skb(struct sk_buff *skb);
  extern void          __kfree_skb(struct sk_buff *skb);
  extern struct sk_buff *__alloc_skb(unsigned int size,
  extern void kfree_skb(struct sk_buff *skb);
  extern void          __kfree_skb(struct sk_buff *skb);
  extern struct sk_buff *__alloc_skb(unsigned int size,

-@@ -1633,6 +1651,10 @@
+@@ -1633,6 +1651,10 @@ static inline void __nf_copy(struct sk_b

        dst->nfct_reasm = src->nfct_reasm;
        nf_conntrack_get_reasm(src->nfct_reasm);
  #endif
        dst->nfct_reasm = src->nfct_reasm;
        nf_conntrack_get_reasm(src->nfct_reasm);
  #endif


@@ -829,7 +829,7 @@
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
  #include <linux/stat.h>
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
  #include <linux/stat.h>

-@@ -1624,7 +1627,11 @@
+@@ -1624,7 +1627,11 @@ int dev_hard_start_xmit(struct sk_buff *

                        struct netdev_queue *txq)
  {
        if (likely(!skb->next)) {
                        struct netdev_queue *txq)
  {
        if (likely(!skb->next)) {


@@ -842,7 +842,7 @@
                        dev_queue_xmit_nit(skb, dev);
  
                if (netif_needs_gso(dev, skb)) {
                        dev_queue_xmit_nit(skb, dev);
  
                if (netif_needs_gso(dev, skb)) {

-@@ -1715,8 +1722,7 @@
+@@ -1715,8 +1722,7 @@ static u16 simple_tx_hash(struct net_dev

        return (u16) (((u64) hash * dev->real_num_tx_queues) >> 32);
  }
  
        return (u16) (((u64) hash * dev->real_num_tx_queues) >> 32);
  }
  


@@ -852,7 +852,7 @@
  {
        u16 queue_index = 0;
  
  {
        u16 queue_index = 0;
  

-@@ -1728,6 +1734,7 @@
+@@ -1728,6 +1734,7 @@ static struct netdev_queue *dev_pick_tx(

        skb_set_queue_mapping(skb, queue_index);
        return netdev_get_tx_queue(dev, queue_index);
  }
        skb_set_queue_mapping(skb, queue_index);
        return netdev_get_tx_queue(dev, queue_index);
  }


@@ -862,7 +862,7 @@
   *    dev_queue_xmit - transmit a buffer
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
   *    dev_queue_xmit - transmit a buffer
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h

-@@ -915,6 +915,7 @@
+@@ -915,6 +915,7 @@ extern int         dev_alloc_name(struct net_de

  extern int            dev_open(struct net_device *dev);
  extern int            dev_close(struct net_device *dev);
  extern void           dev_disable_lro(struct net_device *dev);
  extern int            dev_open(struct net_device *dev);
  extern int            dev_close(struct net_device *dev);
  extern void           dev_disable_lro(struct net_device *dev);


@@ -884,7 +884,7 @@
 +
 --- a/include/net/netfilter/nf_queue.h
 +++ b/include/net/netfilter/nf_queue.h
 +
 --- a/include/net/netfilter/nf_queue.h
 +++ b/include/net/netfilter/nf_queue.h

-@@ -13,6 +13,12 @@
+@@ -13,6 +13,12 @@ struct nf_queue_entry {

        struct net_device       *indev;
        struct net_device       *outdev;
        int                     (*okfn)(struct sk_buff *);
        struct net_device       *indev;
        struct net_device       *outdev;
        int                     (*okfn)(struct sk_buff *);


@@ -897,7 +897,7 @@
  };
  
  #define nf_queue_entry_reroute(x) ((void *)x + sizeof(struct nf_queue_entry))
  };
  
  #define nf_queue_entry_reroute(x) ((void *)x + sizeof(struct nf_queue_entry))

-@@ -30,5 +36,11 @@
+@@ -30,5 +36,11 @@ extern int nf_unregister_queue_handler(i

                                       const struct nf_queue_handler *qh);
  extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
  extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
                                       const struct nf_queue_handler *qh);
  extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
  extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);


@@ -921,7 +921,7 @@
  
  static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
                                  struct pipe_buffer *buf)
  
  static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
                                  struct pipe_buffer *buf)

-@@ -88,6 +91,80 @@
+@@ -88,6 +91,80 @@ static int sock_pipe_buf_steal(struct pi

        return 1;
  }
  
        return 1;
  }
  


@@ -1002,7 +1002,7 @@
  
  /* Pipe buffer operations for a socket. */
  static struct pipe_buf_operations sock_pipe_buf_ops = {
  
  /* Pipe buffer operations for a socket. */
  static struct pipe_buf_operations sock_pipe_buf_ops = {

-@@ -362,6 +439,15 @@
+@@ -362,6 +439,15 @@ static void skb_release_all(struct sk_bu

                WARN_ON(in_irq());
                skb->destructor(skb);
        }
                WARN_ON(in_irq());
                skb->destructor(skb);
        }


@@ -1018,7 +1018,7 @@
  #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
        nf_conntrack_put(skb->nfct);
        nf_conntrack_put_reasm(skb->nfct_reasm);
  #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
        nf_conntrack_put(skb->nfct);
        nf_conntrack_put_reasm(skb->nfct_reasm);

-@@ -424,6 +510,9 @@
+@@ -424,6 +510,9 @@ static void __copy_skb_header(struct sk_

        new->sp                 = secpath_get(old->sp);
  #endif
        memcpy(new->cb, old->cb, sizeof(old->cb));
        new->sp                 = secpath_get(old->sp);
  #endif
        memcpy(new->cb, old->cb, sizeof(old->cb));


@@ -1028,7 +1028,7 @@
        new->csum_start         = old->csum_start;
        new->csum_offset        = old->csum_offset;
        new->local_df           = old->local_df;
        new->csum_start         = old->csum_start;
        new->csum_offset        = old->csum_offset;
        new->local_df           = old->local_df;

-@@ -2326,6 +2415,13 @@
+@@ -2326,6 +2415,13 @@ void __init skb_init(void)

                                                0,
                                                SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                                                NULL);
                                                0,
                                                SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                                                NULL);


@@ -1044,7 +1044,7 @@
  /**
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
  /**
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig

-@@ -342,6 +342,18 @@
+@@ -342,6 +342,18 @@ config NETFILTER_XT_TARGET_DSCP

  
          To compile it as a module, choose M here.  If unsure, say N.
  
  
          To compile it as a module, choose M here.  If unsure, say N.
  


@@ -1065,7 +1065,7 @@
        depends on NETFILTER_XTABLES
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
        depends on NETFILTER_XTABLES
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile

-@@ -42,6 +42,7 @@
+@@ -42,6 +42,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CLASSIF

  obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMARK) += xt_CONNMARK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMARK) += xt_CONNMARK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o


@@ -1075,7 +1075,7 @@
  obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_NFQUEUE.o
 --- a/net/netfilter/nf_queue.c
 +++ b/net/netfilter/nf_queue.c
  obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_NFQUEUE.o
 --- a/net/netfilter/nf_queue.c
 +++ b/net/netfilter/nf_queue.c

-@@ -20,6 +20,26 @@
+@@ -20,6 +20,26 @@ static const struct nf_queue_handler *qu

  
  static DEFINE_MUTEX(queue_handler_mutex);
  
  
  static DEFINE_MUTEX(queue_handler_mutex);
  


@@ -1102,7 +1102,7 @@
  /* return EBUSY when somebody else is registered, return EEXIST if the
   * same handler is registered, return 0 in case of success. */
  int nf_register_queue_handler(int pf, const struct nf_queue_handler *qh)
  /* return EBUSY when somebody else is registered, return EEXIST if the
   * same handler is registered, return 0 in case of success. */
  int nf_register_queue_handler(int pf, const struct nf_queue_handler *qh)

-@@ -80,7 +100,7 @@
+@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const 

  }
  EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
  
  }
  EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
  


@@ -1111,7 +1111,7 @@
  {
        /* Release those devices we held, or Alexey will kill me. */
        if (entry->indev)
  {
        /* Release those devices we held, or Alexey will kill me. */
        if (entry->indev)

-@@ -100,6 +120,7 @@
+@@ -100,6 +120,7 @@ static void nf_queue_entry_release_refs(

        /* Drop reference to owner of hook which queued us. */
        module_put(entry->elem->owner);
  }
        /* Drop reference to owner of hook which queued us. */
        module_put(entry->elem->owner);
  }


@@ -1119,7 +1119,7 @@
  
  /*
   * Any packet that leaves via this function must come back
  
  /*
   * Any packet that leaves via this function must come back

-@@ -121,12 +142,26 @@
+@@ -121,12 +142,26 @@ static int __nf_queue(struct sk_buff *sk

  #endif
        const struct nf_afinfo *afinfo;
        const struct nf_queue_handler *qh;
  #endif
        const struct nf_afinfo *afinfo;
        const struct nf_queue_handler *qh;


@@ -1146,7 +1146,7 @@
                goto err_unlock;
  
        afinfo = nf_get_afinfo(pf);
                goto err_unlock;
  
        afinfo = nf_get_afinfo(pf);

-@@ -145,6 +180,10 @@
+@@ -145,6 +180,10 @@ static int __nf_queue(struct sk_buff *sk

                .indev  = indev,
                .outdev = outdev,
                .okfn   = okfn,
                .indev  = indev,
                .outdev = outdev,
                .okfn   = okfn,


@@ -1157,7 +1157,7 @@
        };
  
        /* If it's going away, ignore hook. */
        };
  
        /* If it's going away, ignore hook. */

-@@ -170,8 +209,19 @@
+@@ -170,8 +209,19 @@ static int __nf_queue(struct sk_buff *sk

        }
  #endif
        afinfo->saveroute(skb, entry);
        }
  #endif
        afinfo->saveroute(skb, entry);

diff --git a/target/linux/generic-2.6/patches-2.6.27/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.27/180-netfilter_depends.patch
index 0897def..74cfa53 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.27/180-netfilter_depends.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/180-netfilter_depends.patch
@@ -1,6 +1,6 @@
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig

-@@ -165,7 +165,7 @@
+@@ -165,7 +165,7 @@ config NF_CONNTRACK_FTP

  
  config NF_CONNTRACK_H323
        tristate "H.323 protocol support"
  
  config NF_CONNTRACK_H323
        tristate "H.323 protocol support"


@@ -9,7 +9,7 @@
        depends on NETFILTER_ADVANCED
        help
          H.323 is a VoIP signalling protocol from ITU-T. As one of the most
        depends on NETFILTER_ADVANCED
        help
          H.323 is a VoIP signalling protocol from ITU-T. As one of the most

-@@ -455,7 +455,7 @@
+@@ -455,7 +455,7 @@ config NETFILTER_XT_TARGET_CONNSECMARK

  
  config NETFILTER_XT_TARGET_TCPMSS
        tristate '"TCPMSS" target support'
  
  config NETFILTER_XT_TARGET_TCPMSS
        tristate '"TCPMSS" target support'

diff --git a/target/linux/generic-2.6/patches-2.6.27/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.27/190-netfilter_rtsp.patch
index 2b439cd..78a1b30 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.27/190-netfilter_rtsp.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/190-netfilter_rtsp.patch
@@ -294,7 +294,7 @@
 +#endif /* _NETFILTER_MIME_H */
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile
 +#endif /* _NETFILTER_MIME_H */
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile

-@@ -23,6 +23,7 @@
+@@ -23,6 +23,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am

  obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
  obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
  obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
  obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
  obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
  obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o


@@ -304,7 +304,7 @@
  obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
  obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig

-@@ -278,6 +278,16 @@
+@@ -278,6 +278,16 @@ config NF_CONNTRACK_TFTP

  
          To compile it as a module, choose M here.  If unsure, say N.
  
  
          To compile it as a module, choose M here.  If unsure, say N.
  


@@ -323,7 +323,7 @@
        depends on NF_CONNTRACK
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
        depends on NF_CONNTRACK
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile

-@@ -33,6 +33,7 @@
+@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co

  obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
  obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
  obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
  obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
  obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
  obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o


@@ -333,7 +333,7 @@
  obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig
  obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig

-@@ -270,6 +270,11 @@
+@@ -270,6 +270,11 @@ config NF_NAT_IRC

        depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
        default NF_NAT && NF_CONNTRACK_IRC
  
        depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
        default NF_NAT && NF_CONNTRACK_IRC
  

diff --git a/target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch
index e96e01c..78681d2 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch
@@ -8,7 +8,7 @@
  static int debug;
  /* initially all NULL */
  static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
  static int debug;
  /* initially all NULL */
  static struct usb_serial *serial_table[SERIAL_TTY_MINORS];

-@@ -835,7 +836,7 @@ int usb_serial_probe(struct usb_interfac
+@@ -856,7 +857,7 @@ int usb_serial_probe(struct usb_interfac

                        dev_err(&interface->dev, "No free urbs available\n");
                        goto probe_error;
                }
                        dev_err(&interface->dev, "No free urbs available\n");
                        goto probe_error;
                }


@@ -17,7 +17,7 @@
                port->bulk_in_size = buffer_size;
                port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
                port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
                port->bulk_in_size = buffer_size;
                port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
                port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);

-@@ -1255,3 +1256,5 @@ MODULE_LICENSE("GPL");
+@@ -1292,3 +1293,5 @@ MODULE_LICENSE("GPL");

  
  module_param(debug, bool, S_IRUGO | S_IWUSR);
  MODULE_PARM_DESC(debug, "Debug enabled or not");
  
  module_param(debug, bool, S_IRUGO | S_IWUSR);
  MODULE_PARM_DESC(debug, "Debug enabled or not");

diff --git a/target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch
index 415e775..50e0efd 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch
@@ -570,7 +570,7 @@
 +
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
 +
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig

-@@ -109,6 +109,129 @@
+@@ -109,6 +109,129 @@ config EQUALIZER

          To compile this driver as a module, choose M here: the module
          will be called eql.  If unsure, say N.
  
          To compile this driver as a module, choose M here: the module
          will be called eql.  If unsure, say N.
  


@@ -702,7 +702,7 @@
        select CRC32
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile
        select CRC32
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile

-@@ -148,6 +148,7 @@
+@@ -148,6 +148,7 @@ obj-$(CONFIG_SLHC) += slhc.o

  obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
  
  obj-$(CONFIG_DUMMY) += dummy.o
  obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
  
  obj-$(CONFIG_DUMMY) += dummy.o


@@ -764,7 +764,7 @@
  
  #define HAVE_ALLOC_SKB                /* For the drivers to know */
  #define HAVE_ALIGNABLE_SKB    /* Ditto 8)                */
  
  #define HAVE_ALLOC_SKB                /* For the drivers to know */
  #define HAVE_ALIGNABLE_SKB    /* Ditto 8)                */

-@@ -278,6 +281,9 @@
+@@ -278,6 +281,9 @@ struct sk_buff {

         * first. This is owned by whoever has the skb queued ATM.
         */
        char                    cb[48];
         * first. This is owned by whoever has the skb queued ATM.
         */
        char                    cb[48];


@@ -774,7 +774,7 @@
  
        unsigned int            len,
                                data_len;
  
        unsigned int            len,
                                data_len;

-@@ -308,6 +314,9 @@
+@@ -308,6 +314,9 @@ struct sk_buff {

        struct nf_conntrack     *nfct;
        struct sk_buff          *nfct_reasm;
  #endif
        struct nf_conntrack     *nfct;
        struct sk_buff          *nfct_reasm;
  #endif


@@ -784,7 +784,7 @@
  #ifdef CONFIG_BRIDGE_NETFILTER
        struct nf_bridge_info   *nf_bridge;
  #endif
  #ifdef CONFIG_BRIDGE_NETFILTER
        struct nf_bridge_info   *nf_bridge;
  #endif

-@@ -327,6 +336,9 @@
+@@ -327,6 +336,9 @@ struct sk_buff {

        __u8                    do_not_encrypt:1;
  #endif
        /* 0/13/14 bit hole */
        __u8                    do_not_encrypt:1;
  #endif
        /* 0/13/14 bit hole */


@@ -794,7 +794,7 @@
  
  #ifdef CONFIG_NET_DMA
        dma_cookie_t            dma_cookie;
  
  #ifdef CONFIG_NET_DMA
        dma_cookie_t            dma_cookie;

-@@ -367,6 +379,12 @@
+@@ -367,6 +379,12 @@ extern void skb_dma_unmap(struct device 

                          enum dma_data_direction dir);
  #endif
  
                          enum dma_data_direction dir);
  #endif
  


@@ -807,7 +807,7 @@
  extern void kfree_skb(struct sk_buff *skb);
  extern void          __kfree_skb(struct sk_buff *skb);
  extern struct sk_buff *__alloc_skb(unsigned int size,
  extern void kfree_skb(struct sk_buff *skb);
  extern void          __kfree_skb(struct sk_buff *skb);
  extern struct sk_buff *__alloc_skb(unsigned int size,

-@@ -1804,6 +1822,10 @@
+@@ -1804,6 +1822,10 @@ static inline void __nf_copy(struct sk_b

        dst->nfct_reasm = src->nfct_reasm;
        nf_conntrack_get_reasm(src->nfct_reasm);
  #endif
        dst->nfct_reasm = src->nfct_reasm;
        nf_conntrack_get_reasm(src->nfct_reasm);
  #endif


@@ -830,7 +830,7 @@
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
  #include <linux/stat.h>
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
  #include <linux/stat.h>

-@@ -1655,7 +1658,11 @@
+@@ -1655,7 +1658,11 @@ int dev_hard_start_xmit(struct sk_buff *

                        struct netdev_queue *txq)
  {
        if (likely(!skb->next)) {
                        struct netdev_queue *txq)
  {
        if (likely(!skb->next)) {


@@ -843,7 +843,7 @@
                        dev_queue_xmit_nit(skb, dev);
  
                if (netif_needs_gso(dev, skb)) {
                        dev_queue_xmit_nit(skb, dev);
  
                if (netif_needs_gso(dev, skb)) {

-@@ -1746,8 +1753,7 @@
+@@ -1746,8 +1753,7 @@ static u16 simple_tx_hash(struct net_dev

        return (u16) (((u64) hash * dev->real_num_tx_queues) >> 32);
  }
  
        return (u16) (((u64) hash * dev->real_num_tx_queues) >> 32);
  }
  


@@ -853,7 +853,7 @@
  {
        u16 queue_index = 0;
  
  {
        u16 queue_index = 0;
  

-@@ -1759,6 +1765,7 @@
+@@ -1759,6 +1765,7 @@ static struct netdev_queue *dev_pick_tx(

        skb_set_queue_mapping(skb, queue_index);
        return netdev_get_tx_queue(dev, queue_index);
  }
        skb_set_queue_mapping(skb, queue_index);
        return netdev_get_tx_queue(dev, queue_index);
  }


@@ -863,7 +863,7 @@
   *    dev_queue_xmit - transmit a buffer
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
   *    dev_queue_xmit - transmit a buffer
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h

-@@ -950,6 +950,7 @@
+@@ -950,6 +950,7 @@ extern int         dev_alloc_name(struct net_de

  extern int            dev_open(struct net_device *dev);
  extern int            dev_close(struct net_device *dev);
  extern void           dev_disable_lro(struct net_device *dev);
  extern int            dev_open(struct net_device *dev);
  extern int            dev_close(struct net_device *dev);
  extern void           dev_disable_lro(struct net_device *dev);


@@ -885,7 +885,7 @@
 +
 --- a/include/net/netfilter/nf_queue.h
 +++ b/include/net/netfilter/nf_queue.h
 +
 --- a/include/net/netfilter/nf_queue.h
 +++ b/include/net/netfilter/nf_queue.h

-@@ -13,6 +13,12 @@
+@@ -13,6 +13,12 @@ struct nf_queue_entry {

        struct net_device       *indev;
        struct net_device       *outdev;
        int                     (*okfn)(struct sk_buff *);
        struct net_device       *indev;
        struct net_device       *outdev;
        int                     (*okfn)(struct sk_buff *);


@@ -898,7 +898,7 @@
  };
  
  #define nf_queue_entry_reroute(x) ((void *)x + sizeof(struct nf_queue_entry))
  };
  
  #define nf_queue_entry_reroute(x) ((void *)x + sizeof(struct nf_queue_entry))

-@@ -30,5 +36,11 @@
+@@ -30,5 +36,11 @@ extern int nf_unregister_queue_handler(u

                                       const struct nf_queue_handler *qh);
  extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
  extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
                                       const struct nf_queue_handler *qh);
  extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
  extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);


@@ -922,7 +922,7 @@
  
  static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
                                  struct pipe_buffer *buf)
  
  static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
                                  struct pipe_buffer *buf)

-@@ -88,6 +91,80 @@
+@@ -88,6 +91,80 @@ static int sock_pipe_buf_steal(struct pi

        return 1;
  }
  
        return 1;
  }
  


@@ -1003,7 +1003,7 @@
  
  /* Pipe buffer operations for a socket. */
  static struct pipe_buf_operations sock_pipe_buf_ops = {
  
  /* Pipe buffer operations for a socket. */
  static struct pipe_buf_operations sock_pipe_buf_ops = {

-@@ -381,6 +458,15 @@
+@@ -381,6 +458,15 @@ static void skb_release_head_state(struc

                WARN_ON(in_irq());
                skb->destructor(skb);
        }
                WARN_ON(in_irq());
                skb->destructor(skb);
        }


@@ -1019,7 +1019,7 @@
  #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
        nf_conntrack_put(skb->nfct);
        nf_conntrack_put_reasm(skb->nfct_reasm);
  #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
        nf_conntrack_put(skb->nfct);
        nf_conntrack_put_reasm(skb->nfct_reasm);

-@@ -493,6 +579,9 @@
+@@ -493,6 +579,9 @@ static void __copy_skb_header(struct sk_

        new->sp                 = secpath_get(old->sp);
  #endif
        memcpy(new->cb, old->cb, sizeof(old->cb));
        new->sp                 = secpath_get(old->sp);
  #endif
        memcpy(new->cb, old->cb, sizeof(old->cb));


@@ -1029,7 +1029,7 @@
        new->csum_start         = old->csum_start;
        new->csum_offset        = old->csum_offset;
        new->local_df           = old->local_df;
        new->csum_start         = old->csum_start;
        new->csum_offset        = old->csum_offset;
        new->local_df           = old->local_df;

-@@ -2397,6 +2486,13 @@
+@@ -2397,6 +2486,13 @@ void __init skb_init(void)

                                                0,
                                                SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                                                NULL);
                                                0,
                                                SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                                                NULL);


@@ -1045,7 +1045,7 @@
  /**
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
  /**
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig

-@@ -357,6 +357,18 @@
+@@ -357,6 +357,18 @@ config NETFILTER_XT_TARGET_DSCP

  
          To compile it as a module, choose M here.  If unsure, say N.
  
  
          To compile it as a module, choose M here.  If unsure, say N.
  


@@ -1066,7 +1066,7 @@
        default m if NETFILTER_ADVANCED=n
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
        default m if NETFILTER_ADVANCED=n
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile

-@@ -45,6 +45,7 @@
+@@ -45,6 +45,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CLASSIF

  obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMARK) += xt_CONNMARK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMARK) += xt_CONNMARK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o


@@ -1076,7 +1076,7 @@
  obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_NFQUEUE.o
 --- a/net/netfilter/nf_queue.c
 +++ b/net/netfilter/nf_queue.c
  obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_NFQUEUE.o
 --- a/net/netfilter/nf_queue.c
 +++ b/net/netfilter/nf_queue.c

-@@ -20,6 +20,26 @@
+@@ -20,6 +20,26 @@ static const struct nf_queue_handler *qu

  
  static DEFINE_MUTEX(queue_handler_mutex);
  
  
  static DEFINE_MUTEX(queue_handler_mutex);
  


@@ -1103,7 +1103,7 @@
  /* return EBUSY when somebody else is registered, return EEXIST if the
   * same handler is registered, return 0 in case of success. */
  int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
  /* return EBUSY when somebody else is registered, return EEXIST if the
   * same handler is registered, return 0 in case of success. */
  int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)

-@@ -80,7 +100,7 @@
+@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const 

  }
  EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
  
  }
  EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
  


@@ -1112,7 +1112,7 @@
  {
        /* Release those devices we held, or Alexey will kill me. */
        if (entry->indev)
  {
        /* Release those devices we held, or Alexey will kill me. */
        if (entry->indev)

-@@ -100,6 +120,7 @@
+@@ -100,6 +120,7 @@ static void nf_queue_entry_release_refs(

        /* Drop reference to owner of hook which queued us. */
        module_put(entry->elem->owner);
  }
        /* Drop reference to owner of hook which queued us. */
        module_put(entry->elem->owner);
  }


@@ -1120,7 +1120,7 @@
  
  /*
   * Any packet that leaves via this function must come back
  
  /*
   * Any packet that leaves via this function must come back

-@@ -121,12 +142,26 @@
+@@ -121,12 +142,26 @@ static int __nf_queue(struct sk_buff *sk

  #endif
        const struct nf_afinfo *afinfo;
        const struct nf_queue_handler *qh;
  #endif
        const struct nf_afinfo *afinfo;
        const struct nf_queue_handler *qh;


@@ -1147,7 +1147,7 @@
                goto err_unlock;
  
        afinfo = nf_get_afinfo(pf);
                goto err_unlock;
  
        afinfo = nf_get_afinfo(pf);

-@@ -145,6 +180,10 @@
+@@ -145,6 +180,10 @@ static int __nf_queue(struct sk_buff *sk

                .indev  = indev,
                .outdev = outdev,
                .okfn   = okfn,
                .indev  = indev,
                .outdev = outdev,
                .okfn   = okfn,


@@ -1158,7 +1158,7 @@
        };
  
        /* If it's going away, ignore hook. */
        };
  
        /* If it's going away, ignore hook. */

-@@ -170,8 +209,19 @@
+@@ -170,8 +209,19 @@ static int __nf_queue(struct sk_buff *sk

        }
  #endif
        afinfo->saveroute(skb, entry);
        }
  #endif
        afinfo->saveroute(skb, entry);

diff --git a/target/linux/generic-2.6/patches-2.6.28/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.28/180-netfilter_depends.patch
index b5a2615..cdfc0b5 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.28/180-netfilter_depends.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/180-netfilter_depends.patch
@@ -1,6 +1,6 @@
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig

-@@ -160,7 +160,6 @@
+@@ -160,7 +160,6 @@ config NF_CONNTRACK_FTP

  
  config NF_CONNTRACK_H323
        tristate "H.323 protocol support"
  
  config NF_CONNTRACK_H323
        tristate "H.323 protocol support"


@@ -8,7 +8,7 @@
        depends on NETFILTER_ADVANCED
        help
          H.323 is a VoIP signalling protocol from ITU-T. As one of the most
        depends on NETFILTER_ADVANCED
        help
          H.323 is a VoIP signalling protocol from ITU-T. As one of the most

-@@ -467,7 +466,6 @@
+@@ -467,7 +466,6 @@ config NETFILTER_XT_TARGET_SECMARK

  
  config NETFILTER_XT_TARGET_TCPMSS
        tristate '"TCPMSS" target support'
  
  config NETFILTER_XT_TARGET_TCPMSS
        tristate '"TCPMSS" target support'

diff --git a/target/linux/generic-2.6/patches-2.6.28/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.28/190-netfilter_rtsp.patch
index 7aff0e6..29e8208 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.28/190-netfilter_rtsp.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/190-netfilter_rtsp.patch
@@ -294,7 +294,7 @@
 +#endif /* _NETFILTER_MIME_H */
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile
 +#endif /* _NETFILTER_MIME_H */
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile

-@@ -26,6 +26,7 @@
+@@ -26,6 +26,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am

  obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
  obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
  obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
  obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
  obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
  obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o


@@ -304,7 +304,7 @@
  obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
  obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig

-@@ -267,6 +267,16 @@
+@@ -267,6 +267,16 @@ config NF_CONNTRACK_TFTP

  
          To compile it as a module, choose M here.  If unsure, say N.
  
  
          To compile it as a module, choose M here.  If unsure, say N.
  


@@ -323,7 +323,7 @@
        select NETFILTER_NETLINK
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
        select NETFILTER_NETLINK
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile

-@@ -33,6 +33,7 @@
+@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co

  obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
  obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
  obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
  obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
  obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
  obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o


@@ -333,7 +333,7 @@
  obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig
  obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig

-@@ -257,6 +257,11 @@
+@@ -257,6 +257,11 @@ config NF_NAT_IRC

        depends on NF_CONNTRACK && NF_NAT
        default NF_NAT && NF_CONNTRACK_IRC
  
        depends on NF_CONNTRACK && NF_NAT
        default NF_NAT && NF_CONNTRACK_IRC
  

diff --git a/target/linux/generic-2.6/patches-2.6.28/205-skb_padding.patch b/target/linux/generic-2.6/patches-2.6.28/205-skb_padding.patch
index 855f0fe..949f887 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.28/205-skb_padding.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/205-skb_padding.patch
@@ -1,6 +1,6 @@
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h

-@@ -1256,11 +1256,18 @@ static inline int skb_network_offset(con
+@@ -1270,11 +1270,18 @@ static inline int skb_network_offset(con

   *
   * Various parts of the networking layer expect at least 16 bytes of
   * headroom, you should not reduce this.
   *
   * Various parts of the networking layer expect at least 16 bytes of
   * headroom, you should not reduce this.


@@ -19,7 +19,7 @@
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
  
  static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
  
  static inline void __skb_trim(struct sk_buff *skb, unsigned int len)

-@@ -1350,9 +1357,9 @@ static inline void __skb_queue_purge(str
+@@ -1364,9 +1371,9 @@ static inline void __skb_queue_purge(str

  static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
                                              gfp_t gfp_mask)
  {
  static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
                                              gfp_t gfp_mask)
  {


@@ -31,7 +31,7 @@
        return skb;
  }
  
        return skb;
  }
  

-@@ -1425,7 +1432,7 @@ static inline int __skb_cow(struct sk_bu
+@@ -1439,7 +1446,7 @@ static inline int __skb_cow(struct sk_bu

                delta = headroom - skb_headroom(skb);
  
        if (delta || cloned)
                delta = headroom - skb_headroom(skb);
  
        if (delta || cloned)


@@ -42,7 +42,7 @@
  }
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
  }
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c

-@@ -243,9 +243,9 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -320,9 +320,9 @@ struct sk_buff *__netdev_alloc_skb(struc

        int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
        struct sk_buff *skb;
  
        int node = dev->dev.parent ? dev_to_node(dev->dev.parent) : -1;
        struct sk_buff *skb;
  

diff --git a/target/linux/generic-2.6/patches-2.6.29/022-mips_force_sig_address_errors.patch b/target/linux/generic-2.6/patches-2.6.29/022-mips_force_sig_address_errors.patch
index 87e7159..7d45fd9 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.29/022-mips_force_sig_address_errors.patch
+++ b/target/linux/generic-2.6/patches-2.6.29/022-mips_force_sig_address_errors.patch
@@ -13,8 +13,6 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
  arch/mips/kernel/unaligned.c |    6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)
 
  arch/mips/kernel/unaligned.c |    6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)
 

-diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
-index bf4c4a9..67bd626 100644

 --- a/arch/mips/kernel/unaligned.c
 +++ b/arch/mips/kernel/unaligned.c
 @@ -482,19 +482,19 @@ fault:
 --- a/arch/mips/kernel/unaligned.c
 +++ b/arch/mips/kernel/unaligned.c
 @@ -482,19 +482,19 @@ fault:


@@ -40,6 +38,3 @@ index bf4c4a9..67bd626 100644
  }
  
  asmlinkage void do_ade(struct pt_regs *regs)
  }
  
  asmlinkage void do_ade(struct pt_regs *regs)

--- 
-1.6.0.6
-

diff --git a/target/linux/generic-2.6/patches-2.6.29/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.29/150-netfilter_imq.patch
index 64cf22a..38894e9 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.29/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.29/150-netfilter_imq.patch
@@ -574,7 +574,7 @@
 +
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
 +
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig

-@@ -110,6 +110,129 @@
+@@ -110,6 +110,129 @@ config EQUALIZER

          To compile this driver as a module, choose M here: the module
          will be called eql.  If unsure, say N.
  
          To compile this driver as a module, choose M here: the module
          will be called eql.  If unsure, say N.
  


@@ -706,7 +706,7 @@
        select CRC32
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile
        select CRC32
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile

-@@ -150,6 +150,7 @@
+@@ -150,6 +150,7 @@ obj-$(CONFIG_SLHC) += slhc.o

  obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
  
  obj-$(CONFIG_DUMMY) += dummy.o
  obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
  
  obj-$(CONFIG_DUMMY) += dummy.o


@@ -768,7 +768,7 @@
  
  #define HAVE_ALLOC_SKB                /* For the drivers to know */
  #define HAVE_ALIGNABLE_SKB    /* Ditto 8)                */
  
  #define HAVE_ALLOC_SKB                /* For the drivers to know */
  #define HAVE_ALIGNABLE_SKB    /* Ditto 8)                */

-@@ -282,6 +285,9 @@
+@@ -282,6 +285,9 @@ struct sk_buff {

         * first. This is owned by whoever has the skb queued ATM.
         */
        char                    cb[48];
         * first. This is owned by whoever has the skb queued ATM.
         */
        char                    cb[48];


@@ -778,7 +778,7 @@
  
        unsigned int            len,
                                data_len;
  
        unsigned int            len,
                                data_len;

-@@ -312,6 +318,9 @@
+@@ -312,6 +318,9 @@ struct sk_buff {

        struct nf_conntrack     *nfct;
        struct sk_buff          *nfct_reasm;
  #endif
        struct nf_conntrack     *nfct;
        struct sk_buff          *nfct_reasm;
  #endif


@@ -788,7 +788,7 @@
  #ifdef CONFIG_BRIDGE_NETFILTER
        struct nf_bridge_info   *nf_bridge;
  #endif
  #ifdef CONFIG_BRIDGE_NETFILTER
        struct nf_bridge_info   *nf_bridge;
  #endif

-@@ -332,6 +341,9 @@
+@@ -332,6 +341,9 @@ struct sk_buff {

        __u8                    requeue:1;
  #endif
        /* 0/13/14 bit hole */
        __u8                    requeue:1;
  #endif
        /* 0/13/14 bit hole */


@@ -798,7 +798,7 @@
  
  #ifdef CONFIG_NET_DMA
        dma_cookie_t            dma_cookie;
  
  #ifdef CONFIG_NET_DMA
        dma_cookie_t            dma_cookie;

-@@ -372,6 +384,12 @@
+@@ -372,6 +384,12 @@ extern void skb_dma_unmap(struct device 

                          enum dma_data_direction dir);
  #endif
  
                          enum dma_data_direction dir);
  #endif
  


@@ -811,7 +811,7 @@
  extern void kfree_skb(struct sk_buff *skb);
  extern void          __kfree_skb(struct sk_buff *skb);
  extern struct sk_buff *__alloc_skb(unsigned int size,
  extern void kfree_skb(struct sk_buff *skb);
  extern void          __kfree_skb(struct sk_buff *skb);
  extern struct sk_buff *__alloc_skb(unsigned int size,

-@@ -1844,6 +1862,10 @@
+@@ -1844,6 +1862,10 @@ static inline void __nf_copy(struct sk_b

        dst->nfct_reasm = src->nfct_reasm;
        nf_conntrack_get_reasm(src->nfct_reasm);
  #endif
        dst->nfct_reasm = src->nfct_reasm;
        nf_conntrack_get_reasm(src->nfct_reasm);
  #endif


@@ -834,7 +834,7 @@
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
  #include <linux/stat.h>
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
  #include <linux/stat.h>

-@@ -1671,7 +1674,11 @@
+@@ -1671,7 +1674,11 @@ int dev_hard_start_xmit(struct sk_buff *

  
        prefetch(&dev->netdev_ops->ndo_start_xmit);
        if (likely(!skb->next)) {
  
        prefetch(&dev->netdev_ops->ndo_start_xmit);
        if (likely(!skb->next)) {


@@ -847,7 +847,7 @@
                        dev_queue_xmit_nit(skb, dev);
  
                if (netif_needs_gso(dev, skb)) {
                        dev_queue_xmit_nit(skb, dev);
  
                if (netif_needs_gso(dev, skb)) {

-@@ -1762,8 +1769,7 @@
+@@ -1762,8 +1769,7 @@ static u16 simple_tx_hash(struct net_dev

        return (u16) (((u64) hash * dev->real_num_tx_queues) >> 32);
  }
  
        return (u16) (((u64) hash * dev->real_num_tx_queues) >> 32);
  }
  


@@ -857,7 +857,7 @@
  {
        const struct net_device_ops *ops = dev->netdev_ops;
        u16 queue_index = 0;
  {
        const struct net_device_ops *ops = dev->netdev_ops;
        u16 queue_index = 0;

-@@ -1776,6 +1782,7 @@
+@@ -1776,6 +1782,7 @@ static struct netdev_queue *dev_pick_tx(

        skb_set_queue_mapping(skb, queue_index);
        return netdev_get_tx_queue(dev, queue_index);
  }
        skb_set_queue_mapping(skb, queue_index);
        return netdev_get_tx_queue(dev, queue_index);
  }


@@ -867,7 +867,7 @@
   *    dev_queue_xmit - transmit a buffer
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
   *    dev_queue_xmit - transmit a buffer
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h

-@@ -1071,6 +1071,7 @@
+@@ -1071,6 +1071,7 @@ extern int               dev_alloc_name(struct net_de

  extern int            dev_open(struct net_device *dev);
  extern int            dev_close(struct net_device *dev);
  extern void           dev_disable_lro(struct net_device *dev);
  extern int            dev_open(struct net_device *dev);
  extern int            dev_close(struct net_device *dev);
  extern void           dev_disable_lro(struct net_device *dev);


@@ -889,7 +889,7 @@
 +
 --- a/include/net/netfilter/nf_queue.h
 +++ b/include/net/netfilter/nf_queue.h
 +
 --- a/include/net/netfilter/nf_queue.h
 +++ b/include/net/netfilter/nf_queue.h

-@@ -13,6 +13,12 @@
+@@ -13,6 +13,12 @@ struct nf_queue_entry {

        struct net_device       *indev;
        struct net_device       *outdev;
        int                     (*okfn)(struct sk_buff *);
        struct net_device       *indev;
        struct net_device       *outdev;
        int                     (*okfn)(struct sk_buff *);


@@ -902,7 +902,7 @@
  };
  
  #define nf_queue_entry_reroute(x) ((void *)x + sizeof(struct nf_queue_entry))
  };
  
  #define nf_queue_entry_reroute(x) ((void *)x + sizeof(struct nf_queue_entry))

-@@ -30,5 +36,11 @@
+@@ -30,5 +36,11 @@ extern int nf_unregister_queue_handler(u

                                       const struct nf_queue_handler *qh);
  extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
  extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
                                       const struct nf_queue_handler *qh);
  extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
  extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);


@@ -926,7 +926,7 @@
  
  static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
                                  struct pipe_buffer *buf)
  
  static void sock_pipe_buf_release(struct pipe_inode_info *pipe,
                                  struct pipe_buffer *buf)

-@@ -88,6 +91,80 @@
+@@ -88,6 +91,80 @@ static int sock_pipe_buf_steal(struct pi

        return 1;
  }
  
        return 1;
  }
  


@@ -1007,7 +1007,7 @@
  
  /* Pipe buffer operations for a socket. */
  static struct pipe_buf_operations sock_pipe_buf_ops = {
  
  /* Pipe buffer operations for a socket. */
  static struct pipe_buf_operations sock_pipe_buf_ops = {

-@@ -381,6 +458,15 @@
+@@ -381,6 +458,15 @@ static void skb_release_head_state(struc

                WARN_ON(in_irq());
                skb->destructor(skb);
        }
                WARN_ON(in_irq());
                skb->destructor(skb);
        }


@@ -1023,7 +1023,7 @@
  #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
        nf_conntrack_put(skb->nfct);
        nf_conntrack_put_reasm(skb->nfct_reasm);
  #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
        nf_conntrack_put(skb->nfct);
        nf_conntrack_put_reasm(skb->nfct_reasm);

-@@ -493,6 +579,9 @@
+@@ -493,6 +579,9 @@ static void __copy_skb_header(struct sk_

        new->sp                 = secpath_get(old->sp);
  #endif
        memcpy(new->cb, old->cb, sizeof(old->cb));
        new->sp                 = secpath_get(old->sp);
  #endif
        memcpy(new->cb, old->cb, sizeof(old->cb));


@@ -1033,7 +1033,7 @@
        new->csum_start         = old->csum_start;
        new->csum_offset        = old->csum_offset;
        new->local_df           = old->local_df;
        new->csum_start         = old->csum_start;
        new->csum_offset        = old->csum_offset;
        new->local_df           = old->local_df;

-@@ -2664,6 +2753,13 @@
+@@ -2664,6 +2753,13 @@ void __init skb_init(void)

                                                0,
                                                SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                                                NULL);
                                                0,
                                                SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                                                NULL);


@@ -1049,7 +1049,7 @@
  /**
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
  /**
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig

-@@ -357,6 +357,18 @@
+@@ -357,6 +357,18 @@ config NETFILTER_XT_TARGET_DSCP

  
          To compile it as a module, choose M here.  If unsure, say N.
  
  
          To compile it as a module, choose M here.  If unsure, say N.
  


@@ -1070,7 +1070,7 @@
        default m if NETFILTER_ADVANCED=n
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
        default m if NETFILTER_ADVANCED=n
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile

-@@ -45,6 +45,7 @@
+@@ -45,6 +45,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CLASSIF

  obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMARK) += xt_CONNMARK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMARK) += xt_CONNMARK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
  obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o


@@ -1080,7 +1080,7 @@
  obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_NFQUEUE.o
 --- a/net/netfilter/nf_queue.c
 +++ b/net/netfilter/nf_queue.c
  obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_NFQUEUE.o
 --- a/net/netfilter/nf_queue.c
 +++ b/net/netfilter/nf_queue.c

-@@ -20,6 +20,26 @@
+@@ -20,6 +20,26 @@ static const struct nf_queue_handler *qu

  
  static DEFINE_MUTEX(queue_handler_mutex);
  
  
  static DEFINE_MUTEX(queue_handler_mutex);
  


@@ -1107,7 +1107,7 @@
  /* return EBUSY when somebody else is registered, return EEXIST if the
   * same handler is registered, return 0 in case of success. */
  int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
  /* return EBUSY when somebody else is registered, return EEXIST if the
   * same handler is registered, return 0 in case of success. */
  int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)

-@@ -80,7 +100,7 @@
+@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const 

  }
  EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
  
  }
  EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);
  


@@ -1116,7 +1116,7 @@
  {
        /* Release those devices we held, or Alexey will kill me. */
        if (entry->indev)
  {
        /* Release those devices we held, or Alexey will kill me. */
        if (entry->indev)

-@@ -100,6 +120,7 @@
+@@ -100,6 +120,7 @@ static void nf_queue_entry_release_refs(

        /* Drop reference to owner of hook which queued us. */
        module_put(entry->elem->owner);
  }
        /* Drop reference to owner of hook which queued us. */
        module_put(entry->elem->owner);
  }


@@ -1124,7 +1124,7 @@
  
  /*
   * Any packet that leaves via this function must come back
  
  /*
   * Any packet that leaves via this function must come back

-@@ -121,12 +142,26 @@
+@@ -121,12 +142,26 @@ static int __nf_queue(struct sk_buff *sk

  #endif
        const struct nf_afinfo *afinfo;
        const struct nf_queue_handler *qh;
  #endif
        const struct nf_afinfo *afinfo;
        const struct nf_queue_handler *qh;


@@ -1151,7 +1151,7 @@
                goto err_unlock;
  
        afinfo = nf_get_afinfo(pf);
                goto err_unlock;
  
        afinfo = nf_get_afinfo(pf);

-@@ -145,6 +180,10 @@
+@@ -145,6 +180,10 @@ static int __nf_queue(struct sk_buff *sk

                .indev  = indev,
                .outdev = outdev,
                .okfn   = okfn,
                .indev  = indev,
                .outdev = outdev,
                .okfn   = okfn,


@@ -1162,7 +1162,7 @@
        };
  
        /* If it's going away, ignore hook. */
        };
  
        /* If it's going away, ignore hook. */

-@@ -170,8 +209,19 @@
+@@ -170,8 +209,19 @@ static int __nf_queue(struct sk_buff *sk

        }
  #endif
        afinfo->saveroute(skb, entry);
        }
  #endif
        afinfo->saveroute(skb, entry);

diff --git a/target/linux/generic-2.6/patches-2.6.29/180-netfilter_depends.patch b/target/linux/generic-2.6/patches-2.6.29/180-netfilter_depends.patch
index 3694709..05e1c07 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.29/180-netfilter_depends.patch
+++ b/target/linux/generic-2.6/patches-2.6.29/180-netfilter_depends.patch
@@ -1,6 +1,6 @@
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig

-@@ -160,7 +160,6 @@
+@@ -160,7 +160,6 @@ config NF_CONNTRACK_FTP

  
  config NF_CONNTRACK_H323
        tristate "H.323 protocol support"
  
  config NF_CONNTRACK_H323
        tristate "H.323 protocol support"


@@ -8,7 +8,7 @@
        depends on NETFILTER_ADVANCED
        help
          H.323 is a VoIP signalling protocol from ITU-T. As one of the most
        depends on NETFILTER_ADVANCED
        help
          H.323 is a VoIP signalling protocol from ITU-T. As one of the most

-@@ -466,7 +465,6 @@
+@@ -466,7 +465,6 @@ config NETFILTER_XT_TARGET_SECMARK

  
  config NETFILTER_XT_TARGET_TCPMSS
        tristate '"TCPMSS" target support'
  
  config NETFILTER_XT_TARGET_TCPMSS
        tristate '"TCPMSS" target support'

diff --git a/target/linux/generic-2.6/patches-2.6.29/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.29/190-netfilter_rtsp.patch
index 7aff0e6..29e8208 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.29/190-netfilter_rtsp.patch
+++ b/target/linux/generic-2.6/patches-2.6.29/190-netfilter_rtsp.patch
@@ -294,7 +294,7 @@
 +#endif /* _NETFILTER_MIME_H */
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile
 +#endif /* _NETFILTER_MIME_H */
 --- a/net/ipv4/netfilter/Makefile
 +++ b/net/ipv4/netfilter/Makefile

-@@ -26,6 +26,7 @@
+@@ -26,6 +26,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am

  obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
  obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
  obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
  obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
  obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
  obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o


@@ -304,7 +304,7 @@
  obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
  obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig

-@@ -267,6 +267,16 @@
+@@ -267,6 +267,16 @@ config NF_CONNTRACK_TFTP

  
          To compile it as a module, choose M here.  If unsure, say N.
  
  
          To compile it as a module, choose M here.  If unsure, say N.
  


@@ -323,7 +323,7 @@
        select NETFILTER_NETLINK
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
        select NETFILTER_NETLINK
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile

-@@ -33,6 +33,7 @@
+@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co

  obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
  obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
  obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
  obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
  obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
  obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o


@@ -333,7 +333,7 @@
  obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig
  obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o
 --- a/net/ipv4/netfilter/Kconfig
 +++ b/net/ipv4/netfilter/Kconfig

-@@ -257,6 +257,11 @@
+@@ -257,6 +257,11 @@ config NF_NAT_IRC

        depends on NF_CONNTRACK && NF_NAT
        default NF_NAT && NF_CONNTRACK_IRC
  
        depends on NF_CONNTRACK && NF_NAT
        default NF_NAT && NF_CONNTRACK_IRC
  

diff --git a/target/linux/generic-2.6/patches-2.6.29/221-binfmt_elf_gcc4.1.patch b/target/linux/generic-2.6/patches-2.6.29/221-binfmt_elf_gcc4.1.patch
index df053dd..f55ce34 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.29/221-binfmt_elf_gcc4.1.patch
+++ b/target/linux/generic-2.6/patches-2.6.29/221-binfmt_elf_gcc4.1.patch
@@ -1,6 +1,6 @@
---- linux-2.6.29.2/fs/binfmt_elf.c     2009-04-27 19:37:11.000000000 +0200
-+++ linux-2.6.29.2.new/fs/binfmt_elf.c 2009-05-06 16:05:32.000000000 +0200
-@@ -1211,7 +1211,7 @@
+--- a/fs/binfmt_elf.c
++++ b/fs/binfmt_elf.c
+@@ -1211,7 +1211,7 @@ static unsigned long vma_dump_size(struc

        if (FILTER(ELF_HEADERS) &&
            vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) {
                u32 __user *header = (u32 __user *) vma->vm_start;
        if (FILTER(ELF_HEADERS) &&
            vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) {
                u32 __user *header = (u32 __user *) vma->vm_start;

diff --git a/target/linux/generic-2.6/patches-2.6.29/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.29/801-usb_serial_endpoint_size.patch
index 73b3a9f..6b8ff1d 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.29/801-usb_serial_endpoint_size.patch
+++ b/target/linux/generic-2.6/patches-2.6.29/801-usb_serial_endpoint_size.patch
@@ -8,7 +8,7 @@
  static int debug;
  /* initially all NULL */
  static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
  static int debug;
  /* initially all NULL */
  static struct usb_serial *serial_table[SERIAL_TTY_MINORS];

-@@ -840,7 +841,7 @@ int usb_serial_probe(struct usb_interfac
+@@ -861,7 +862,7 @@ int usb_serial_probe(struct usb_interfac

                        dev_err(&interface->dev, "No free urbs available\n");
                        goto probe_error;
                }
                        dev_err(&interface->dev, "No free urbs available\n");
                        goto probe_error;
                }


@@ -17,7 +17,7 @@
                port->bulk_in_size = buffer_size;
                port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
                port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
                port->bulk_in_size = buffer_size;
                port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
                port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);

-@@ -1269,3 +1270,5 @@ MODULE_LICENSE("GPL");
+@@ -1306,3 +1307,5 @@ MODULE_LICENSE("GPL");

  
  module_param(debug, bool, S_IRUGO | S_IWUSR);
  MODULE_PARM_DESC(debug, "Debug enabled or not");
  
  module_param(debug, bool, S_IRUGO | S_IWUSR);
  MODULE_PARM_DESC(debug, "Debug enabled or not");

diff --git a/target/linux/generic-2.6/patches-2.6.29/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.29/980-vm_exports.patch
index f4942cb..18ed895 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.29/980-vm_exports.patch
+++ b/target/linux/generic-2.6/patches-2.6.29/980-vm_exports.patch
@@ -40,7 +40,7 @@
  {
 --- a/kernel/exit.c
 +++ b/kernel/exit.c
  {
 --- a/kernel/exit.c
 +++ b/kernel/exit.c

-@@ -521,6 +521,7 @@ struct files_struct *get_files_struct(st
+@@ -516,6 +516,7 @@ struct files_struct *get_files_struct(st

  
        return files;
  }
  
        return files;
  }


@@ -48,7 +48,7 @@
  
  void put_files_struct(struct files_struct *files)
  {
  
  void put_files_struct(struct files_struct *files)
  {

-@@ -540,6 +541,7 @@ void put_files_struct(struct files_struc
+@@ -535,6 +536,7 @@ void put_files_struct(struct files_struc

                free_fdtable(fdt);
        }
  }
                free_fdtable(fdt);
        }
  }