[adm5120] generate firmware images for the ZyXEL P-334WT/P-335WT devices

[openwrt.git] / target / linux / generic-2.6 / patches / 201-multiple_default_gateways.patch

diff --git a/target/linux/generic-2.6/patches/201-multiple_default_gateways.patch b/target/linux/generic-2.6/patches/201-multiple_default_gateways.patch
index 8b6612f..b0acd9a 100644 (file)
--- a/target/linux/generic-2.6/patches/201-multiple_default_gateways.patch
+++ b/target/linux/generic-2.6/patches/201-multiple_default_gateways.patch
@@ -1,7 +1,8 @@
-diff -urN linux-2.6.21.1/include/linux/netfilter_ipv4/ip_nat.h linux-2.6.21.1.new/include/linux/netfilter_ipv4/ip_nat.h
---- linux-2.6.21.1/include/linux/netfilter_ipv4/ip_nat.h       2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21.1.new/include/linux/netfilter_ipv4/ip_nat.h   2007-05-14 12:57:39.000000000 +0200
-@@ -64,6 +64,13 @@
+Index: linux-2.6.21.7/include/linux/netfilter_ipv4/ip_nat.h
+===================================================================
+--- linux-2.6.21.7.orig/include/linux/netfilter_ipv4/ip_nat.h
++++ linux-2.6.21.7/include/linux/netfilter_ipv4/ip_nat.h
+@@ -64,6 +64,13 @@ struct ip_nat_info
  
  struct ip_conntrack;
  
@@ -15,10 +16,11 @@ diff -urN linux-2.6.21.1/include/linux/netfilter_ipv4/ip_nat.h linux-2.6.21.1.ne
  /* Set up the info structure to map into this range. */
  extern unsigned int ip_nat_setup_info(struct ip_conntrack *conntrack,
                                      const struct ip_nat_range *range,
-diff -urN linux-2.6.21.1/include/linux/rtnetlink.h linux-2.6.21.1.new/include/linux/rtnetlink.h
---- linux-2.6.21.1/include/linux/rtnetlink.h   2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21.1.new/include/linux/rtnetlink.h       2007-05-14 12:57:39.000000000 +0200
-@@ -293,6 +293,8 @@
+Index: linux-2.6.21.7/include/linux/rtnetlink.h
+===================================================================
+--- linux-2.6.21.7.orig/include/linux/rtnetlink.h
++++ linux-2.6.21.7/include/linux/rtnetlink.h
+@@ -293,6 +293,8 @@ struct rtnexthop
  #define RTNH_F_DEAD           1       /* Nexthop is dead (used by multipath)  */
  #define RTNH_F_PERVASIVE      2       /* Do recursive gateway lookup  */
  #define RTNH_F_ONLINK         4       /* Gateway is forced on link    */
@@ -27,10 +29,11 @@ diff -urN linux-2.6.21.1/include/linux/rtnetlink.h linux-2.6.21.1.new/include/li
  
  /* Macros to handle hexthops */
  
-diff -urN linux-2.6.21.1/include/net/flow.h linux-2.6.21.1.new/include/net/flow.h
---- linux-2.6.21.1/include/net/flow.h  2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21.1.new/include/net/flow.h      2007-05-14 13:00:27.000000000 +0200
-@@ -19,6 +19,8 @@
+Index: linux-2.6.21.7/include/net/flow.h
+===================================================================
+--- linux-2.6.21.7.orig/include/net/flow.h
++++ linux-2.6.21.7/include/net/flow.h
+@@ -19,6 +19,8 @@ struct flowi {
                struct {
                        __be32                  daddr;
                        __be32                  saddr;
@@ -39,7 +42,7 @@ diff -urN linux-2.6.21.1/include/net/flow.h linux-2.6.21.1.new/include/net/flow.
                        __u8                    tos;
                        __u8                    scope;
                } ip4_u;
-@@ -43,6 +45,8 @@
+@@ -43,6 +45,8 @@ struct flowi {
  #define fl6_flowlabel nl_u.ip6_u.flowlabel
  #define fl4_dst               nl_u.ip4_u.daddr
  #define fl4_src               nl_u.ip4_u.saddr
@@ -48,10 +51,11 @@ diff -urN linux-2.6.21.1/include/net/flow.h linux-2.6.21.1.new/include/net/flow.
  #define fl4_tos               nl_u.ip4_u.tos
  #define fl4_scope     nl_u.ip4_u.scope
  
-diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
---- linux-2.6.21.1/net/ipv4/route.c    2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21.1.new/net/ipv4/route.c        2007-05-14 13:09:24.000000000 +0200
-@@ -1208,6 +1208,7 @@
+Index: linux-2.6.21.7/net/ipv4/route.c
+===================================================================
+--- linux-2.6.21.7.orig/net/ipv4/route.c
++++ linux-2.6.21.7/net/ipv4/route.c
+@@ -1208,6 +1208,7 @@ void ip_rt_redirect(__be32 old_gw, __be3
  
                                /* Gateway is different ... */
                                rt->rt_gateway          = new_gw;
@@ -59,7 +63,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
  
                                /* Redirect received -> path was valid */
                                dst_confirm(&rth->u.dst);
-@@ -1643,6 +1644,7 @@
+@@ -1643,6 +1644,7 @@ static int ip_route_input_mc(struct sk_b
        rth->fl.fl4_tos = tos;
        rth->fl.mark    = skb->mark;
        rth->fl.fl4_src = saddr;
@@ -67,7 +71,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
        rth->rt_src     = saddr;
  #ifdef CONFIG_NET_CLS_ROUTE
        rth->u.dst.tclassid = itag;
-@@ -1653,6 +1655,7 @@
+@@ -1653,6 +1655,7 @@ static int ip_route_input_mc(struct sk_b
        dev_hold(rth->u.dst.dev);
        rth->idev       = in_dev_get(rth->u.dst.dev);
        rth->fl.oif     = 0;
@@ -75,7 +79,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
        rth->rt_gateway = daddr;
        rth->rt_spec_dst= spec_dst;
        rth->rt_type    = RTN_MULTICAST;
-@@ -1716,7 +1719,7 @@
+@@ -1716,7 +1719,7 @@ static void ip_handle_martian_source(str
  static inline int __mkroute_input(struct sk_buff *skb,
                                  struct fib_result* res,
                                  struct in_device *in_dev,
@@ -84,7 +88,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
                                  struct rtable **result)
  {
  
-@@ -1751,6 +1754,7 @@
+@@ -1751,6 +1754,7 @@ static inline int __mkroute_input(struct
                flags |= RTCF_DIRECTSRC;
  
        if (out_dev == in_dev && err && !(flags & (RTCF_NAT | RTCF_MASQ)) &&
@@ -92,7 +96,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
            (IN_DEV_SHARED_MEDIA(out_dev) ||
             inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res))))
                flags |= RTCF_DOREDIRECT;
-@@ -1788,6 +1792,7 @@
+@@ -1788,6 +1792,7 @@ static inline int __mkroute_input(struct
        rth->fl.mark    = skb->mark;
        rth->fl.fl4_src = saddr;
        rth->rt_src     = saddr;
@@ -100,7 +104,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
        rth->rt_gateway = daddr;
        rth->rt_iif     =
                rth->fl.iif     = in_dev->dev->ifindex;
-@@ -1795,6 +1800,7 @@
+@@ -1795,6 +1800,7 @@ static inline int __mkroute_input(struct
        dev_hold(rth->u.dst.dev);
        rth->idev       = in_dev_get(rth->u.dst.dev);
        rth->fl.oif     = 0;
@@ -108,7 +112,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
        rth->rt_spec_dst= spec_dst;
  
        rth->u.dst.input = ip_forward;
-@@ -1816,19 +1822,21 @@
+@@ -1816,19 +1822,21 @@ static inline int ip_mkroute_input_def(s
                                       struct fib_result* res,
                                       const struct flowi *fl,
                                       struct in_device *in_dev,
@@ -133,7 +137,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
        if (err)
                return err;
  
-@@ -1841,7 +1849,8 @@
+@@ -1841,7 +1849,8 @@ static inline int ip_mkroute_input(struc
                                   struct fib_result* res,
                                   const struct flowi *fl,
                                   struct in_device *in_dev,
@@ -143,7 +147,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
  {
  #ifdef CONFIG_IP_ROUTE_MULTIPATH_CACHED
        struct rtable* rth = NULL, *rtres;
-@@ -1857,7 +1866,7 @@
+@@ -1857,7 +1866,7 @@ static inline int ip_mkroute_input(struc
        /* distinguish between multipath and singlepath */
        if (hopcount < 2)
                return ip_mkroute_input_def(skb, res, fl, in_dev, daddr,
@@ -152,7 +156,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
  
        /* add all alternatives to the routing cache */
        for (hop = 0; hop < hopcount; hop++) {
-@@ -1869,7 +1878,7 @@
+@@ -1869,7 +1878,7 @@ static inline int ip_mkroute_input(struc
  
                /* create a routing cache entry */
                err = __mkroute_input(skb, res, in_dev, daddr, saddr, tos,
@@ -161,7 +165,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
                if (err)
                        return err;
  
-@@ -1889,7 +1898,7 @@
+@@ -1889,7 +1898,7 @@ static inline int ip_mkroute_input(struc
        skb->dst = &rtres->u.dst;
        return err;
  #else /* CONFIG_IP_ROUTE_MULTIPATH_CACHED  */
@@ -170,7 +174,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
  #endif /* CONFIG_IP_ROUTE_MULTIPATH_CACHED  */
  }
  
-@@ -1905,18 +1914,18 @@
+@@ -1905,18 +1914,18 @@ static inline int ip_mkroute_input(struc
   */
  
  static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
@@ -192,7 +196,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
        unsigned        flags = 0;
        u32             itag = 0;
        struct rtable * rth;
-@@ -1949,6 +1958,12 @@
+@@ -1949,6 +1958,12 @@ static int ip_route_input_slow(struct sk
        if (BADCLASS(daddr) || ZERONET(daddr) || LOOPBACK(daddr))
                goto martian_destination;
  
@@ -205,7 +209,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
        /*
         *      Now we are ready to route packet.
         */
-@@ -1958,6 +1973,10 @@
+@@ -1958,6 +1973,10 @@ static int ip_route_input_slow(struct sk
                goto no_route;
        }
        free_res = 1;
@@ -216,7 +220,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
  
        RT_CACHE_STAT_INC(in_slow_tot);
  
-@@ -1982,7 +2001,7 @@
+@@ -1982,7 +2001,7 @@ static int ip_route_input_slow(struct sk
        if (res.type != RTN_UNICAST)
                goto martian_destination;
  
@@ -225,7 +229,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
        if (err == -ENOBUFS)
                goto e_nobufs;
        if (err == -EINVAL)
-@@ -1997,6 +2016,8 @@
+@@ -1997,6 +2016,8 @@ out:     return err;
  brd_input:
        if (skb->protocol != htons(ETH_P_IP))
                goto e_inval;
@@ -234,7 +238,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
  
        if (ZERONET(saddr))
                spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK);
-@@ -2037,6 +2058,7 @@
+@@ -2037,6 +2058,7 @@ local_input:
        rth->u.dst.dev  = &loopback_dev;
        dev_hold(rth->u.dst.dev);
        rth->idev       = in_dev_get(rth->u.dst.dev);
@@ -242,7 +246,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
        rth->rt_gateway = daddr;
        rth->rt_spec_dst= spec_dst;
        rth->u.dst.input= ip_local_deliver;
-@@ -2086,8 +2108,9 @@
+@@ -2086,8 +2108,9 @@ martian_source:
        goto e_inval;
  }
  
@@ -254,7 +258,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
  {
        struct rtable * rth;
        unsigned        hash;
-@@ -2102,6 +2125,7 @@
+@@ -2102,6 +2125,7 @@ int ip_route_input(struct sk_buff *skb, 
                if (rth->fl.fl4_dst == daddr &&
                    rth->fl.fl4_src == saddr &&
                    rth->fl.iif == iif &&
@@ -262,7 +266,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
                    rth->fl.oif == 0 &&
                    rth->fl.mark == skb->mark &&
                    rth->fl.fl4_tos == tos) {
-@@ -2148,7 +2172,19 @@
+@@ -2148,7 +2172,19 @@ int ip_route_input(struct sk_buff *skb, 
                rcu_read_unlock();
                return -EINVAL;
        }
@@ -283,7 +287,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
  }
  
  static inline int __mkroute_output(struct rtable **result,
-@@ -2227,6 +2263,7 @@
+@@ -2227,6 +2263,7 @@ static inline int __mkroute_output(struc
        rth->fl.fl4_tos = tos;
        rth->fl.fl4_src = oldflp->fl4_src;
        rth->fl.oif     = oldflp->oif;
@@ -291,7 +295,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
        rth->fl.mark    = oldflp->mark;
        rth->rt_dst     = fl->fl4_dst;
        rth->rt_src     = fl->fl4_src;
-@@ -2367,6 +2404,7 @@
+@@ -2367,6 +2404,7 @@ static int ip_route_output_slow(struct r
        struct flowi fl = { .nl_u = { .ip4_u =
                                      { .daddr = oldflp->fl4_dst,
                                        .saddr = oldflp->fl4_src,
@@ -299,7 +303,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
                                        .tos = tos & IPTOS_RT_MASK,
                                        .scope = ((tos & RTO_ONLINK) ?
                                                  RT_SCOPE_LINK :
-@@ -2470,6 +2508,7 @@
+@@ -2470,6 +2508,7 @@ static int ip_route_output_slow(struct r
                dev_out = &loopback_dev;
                dev_hold(dev_out);
                fl.oif = loopback_dev.ifindex;
@@ -307,7 +311,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
                res.type = RTN_LOCAL;
                flags |= RTCF_LOCAL;
                goto make_route;
-@@ -2477,7 +2516,7 @@
+@@ -2477,7 +2516,7 @@ static int ip_route_output_slow(struct r
  
        if (fib_lookup(&fl, &res)) {
                res.fi = NULL;
@@ -316,7 +320,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
                        /* Apparently, routing tables are wrong. Assume,
                           that the destination is on link.
  
-@@ -2517,6 +2556,7 @@
+@@ -2517,6 +2556,7 @@ static int ip_route_output_slow(struct r
                dev_out = &loopback_dev;
                dev_hold(dev_out);
                fl.oif = dev_out->ifindex;
@@ -324,7 +328,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
                if (res.fi)
                        fib_info_put(res.fi);
                res.fi = NULL;
-@@ -2524,13 +2564,12 @@
+@@ -2524,13 +2564,12 @@ static int ip_route_output_slow(struct r
                goto make_route;
        }
  
@@ -341,7 +345,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
  
        if (!fl.fl4_src)
                fl.fl4_src = FIB_RES_PREFSRC(res);
-@@ -2567,6 +2606,7 @@
+@@ -2567,6 +2606,7 @@ int __ip_route_output_key(struct rtable 
                    rth->fl.fl4_src == flp->fl4_src &&
                    rth->fl.iif == 0 &&
                    rth->fl.oif == flp->oif &&
@@ -349,7 +353,7 @@ diff -urN linux-2.6.21.1/net/ipv4/route.c linux-2.6.21.1.new/net/ipv4/route.c
                    rth->fl.mark == flp->mark &&
                    !((rth->fl.fl4_tos ^ flp->fl4_tos) &
                            (IPTOS_RT_MASK | RTO_ONLINK))) {
-@@ -3199,3 +3239,4 @@
+@@ -3199,3 +3239,4 @@ int __init ip_rt_init(void)
  EXPORT_SYMBOL(__ip_select_ident);
  EXPORT_SYMBOL(ip_route_input);
  EXPORT_SYMBOL(ip_route_output_key);