refresh generic 2.6.23 patches in upstream style

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

1 files changed, 34 insertions, 40 deletions

diff --git a/target/linux/generic-2.6/patches-2.6.23/201-multiple_default_gateways.patch b/target/linux/generic-2.6/patches-2.6.23/201-multiple_default_gateways.patch
index 1232489279..a13bb198f9 100644
--- a/target/linux/generic-2.6/patches-2.6.23/201-multiple_default_gateways.patch
+++ b/target/linux/generic-2.6/patches-2.6.23/201-multiple_default_gateways.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.23.17/include/linux/rtnetlink.h
-===================================================================
---- linux-2.6.23.17.orig/include/linux/rtnetlink.h
-+++ linux-2.6.23.17/include/linux/rtnetlink.h
-@@ -293,6 +293,8 @@ struct rtnexthop
+--- a/include/linux/rtnetlink.h
++++ b/include/linux/rtnetlink.h
+@@ -293,6 +293,8 @@
  #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	*/
@@ -11,11 +9,9 @@ Index: linux-2.6.23.17/include/linux/rtnetlink.h
  
  /* Macros to handle hexthops */
  
-Index: linux-2.6.23.17/include/net/flow.h
-===================================================================
---- linux-2.6.23.17.orig/include/net/flow.h
-+++ linux-2.6.23.17/include/net/flow.h
-@@ -19,6 +19,8 @@ struct flowi {
+--- a/include/net/flow.h
++++ b/include/net/flow.h
+@@ -19,6 +19,8 @@
  		struct {
  			__be32			daddr;
  			__be32			saddr;
@@ -24,7 +20,7 @@ Index: linux-2.6.23.17/include/net/flow.h
  			__u8			tos;
  			__u8			scope;
  		} ip4_u;
-@@ -43,6 +45,8 @@ struct flowi {
+@@ -43,6 +45,8 @@
  #define fl6_flowlabel	nl_u.ip6_u.flowlabel
  #define fl4_dst		nl_u.ip4_u.daddr
  #define fl4_src		nl_u.ip4_u.saddr
@@ -33,11 +29,9 @@ Index: linux-2.6.23.17/include/net/flow.h
  #define fl4_tos		nl_u.ip4_u.tos
  #define fl4_scope	nl_u.ip4_u.scope
  
-Index: linux-2.6.23.17/net/ipv4/route.c
-===================================================================
---- linux-2.6.23.17.orig/net/ipv4/route.c
-+++ linux-2.6.23.17/net/ipv4/route.c
-@@ -1116,6 +1116,7 @@ void ip_rt_redirect(__be32 old_gw, __be3
+--- a/net/ipv4/route.c
++++ b/net/ipv4/route.c
+@@ -1116,6 +1116,7 @@
  
  				/* Gateway is different ... */
  				rt->rt_gateway		= new_gw;
@@ -45,7 +39,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  
  				/* Redirect received -> path was valid */
  				dst_confirm(&rth->u.dst);
-@@ -1551,6 +1552,7 @@ static int ip_route_input_mc(struct sk_b
+@@ -1551,6 +1552,7 @@
  	rth->fl.fl4_tos	= tos;
  	rth->fl.mark    = skb->mark;
  	rth->fl.fl4_src	= saddr;
@@ -53,7 +47,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  	rth->rt_src	= saddr;
  #ifdef CONFIG_NET_CLS_ROUTE
  	rth->u.dst.tclassid = itag;
-@@ -1561,6 +1563,7 @@ static int ip_route_input_mc(struct sk_b
+@@ -1561,6 +1563,7 @@
  	dev_hold(rth->u.dst.dev);
  	rth->idev	= in_dev_get(rth->u.dst.dev);
  	rth->fl.oif	= 0;
@@ -61,7 +55,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  	rth->rt_gateway	= daddr;
  	rth->rt_spec_dst= spec_dst;
  	rth->rt_type	= RTN_MULTICAST;
-@@ -1624,7 +1627,7 @@ static void ip_handle_martian_source(str
+@@ -1624,7 +1627,7 @@
  static inline int __mkroute_input(struct sk_buff *skb,
  				  struct fib_result* res,
  				  struct in_device *in_dev,
@@ -70,7 +64,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  				  struct rtable **result)
  {
  
-@@ -1659,6 +1662,7 @@ static inline int __mkroute_input(struct
+@@ -1659,6 +1662,7 @@
  		flags |= RTCF_DIRECTSRC;
  
  	if (out_dev == in_dev && err && !(flags & (RTCF_NAT | RTCF_MASQ)) &&
@@ -78,7 +72,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  	    (IN_DEV_SHARED_MEDIA(out_dev) ||
  	     inet_addr_onlink(out_dev, saddr, FIB_RES_GW(*res))))
  		flags |= RTCF_DOREDIRECT;
-@@ -1692,6 +1696,7 @@ static inline int __mkroute_input(struct
+@@ -1692,6 +1696,7 @@
  	rth->fl.mark    = skb->mark;
  	rth->fl.fl4_src	= saddr;
  	rth->rt_src	= saddr;
@@ -86,7 +80,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  	rth->rt_gateway	= daddr;
  	rth->rt_iif 	=
  		rth->fl.iif	= in_dev->dev->ifindex;
-@@ -1699,6 +1704,7 @@ static inline int __mkroute_input(struct
+@@ -1699,6 +1704,7 @@
  	dev_hold(rth->u.dst.dev);
  	rth->idev	= in_dev_get(rth->u.dst.dev);
  	rth->fl.oif 	= 0;
@@ -94,7 +88,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  	rth->rt_spec_dst= spec_dst;
  
  	rth->u.dst.input = ip_forward;
-@@ -1720,19 +1726,21 @@ static inline int ip_mkroute_input(struc
+@@ -1720,19 +1726,21 @@
  				   struct fib_result* res,
  				   const struct flowi *fl,
  				   struct in_device *in_dev,
@@ -119,7 +113,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  	if (err)
  		return err;
  
-@@ -1752,18 +1760,18 @@ static inline int ip_mkroute_input(struc
+@@ -1752,18 +1760,18 @@
   */
  
  static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
@@ -141,7 +135,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  	unsigned	flags = 0;
  	u32		itag = 0;
  	struct rtable * rth;
-@@ -1796,6 +1804,12 @@ static int ip_route_input_slow(struct sk
+@@ -1796,6 +1804,12 @@
  	if (BADCLASS(daddr) || ZERONET(daddr) || LOOPBACK(daddr))
  		goto martian_destination;
  
@@ -154,7 +148,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  	/*
  	 *	Now we are ready to route packet.
  	 */
-@@ -1805,6 +1819,10 @@ static int ip_route_input_slow(struct sk
+@@ -1805,6 +1819,10 @@
  		goto no_route;
  	}
  	free_res = 1;
@@ -165,7 +159,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  
  	RT_CACHE_STAT_INC(in_slow_tot);
  
-@@ -1829,7 +1847,7 @@ static int ip_route_input_slow(struct sk
+@@ -1829,7 +1847,7 @@
  	if (res.type != RTN_UNICAST)
  		goto martian_destination;
  
@@ -174,7 +168,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  	if (err == -ENOBUFS)
  		goto e_nobufs;
  	if (err == -EINVAL)
-@@ -1844,6 +1862,8 @@ out:	return err;
+@@ -1844,6 +1862,8 @@
  brd_input:
  	if (skb->protocol != htons(ETH_P_IP))
  		goto e_inval;
@@ -183,7 +177,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  
  	if (ZERONET(saddr))
  		spec_dst = inet_select_addr(dev, 0, RT_SCOPE_LINK);
-@@ -1884,6 +1904,7 @@ local_input:
+@@ -1884,6 +1904,7 @@
  	rth->u.dst.dev	= &loopback_dev;
  	dev_hold(rth->u.dst.dev);
  	rth->idev	= in_dev_get(rth->u.dst.dev);
@@ -191,7 +185,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  	rth->rt_gateway	= daddr;
  	rth->rt_spec_dst= spec_dst;
  	rth->u.dst.input= ip_local_deliver;
-@@ -1933,8 +1954,9 @@ martian_source:
+@@ -1933,8 +1954,9 @@
  	goto e_inval;
  }
  
@@ -203,7 +197,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  {
  	struct rtable * rth;
  	unsigned	hash;
-@@ -1949,6 +1971,7 @@ int ip_route_input(struct sk_buff *skb, 
+@@ -1949,6 +1971,7 @@
  		if (rth->fl.fl4_dst == daddr &&
  		    rth->fl.fl4_src == saddr &&
  		    rth->fl.iif == iif &&
@@ -211,7 +205,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  		    rth->fl.oif == 0 &&
  		    rth->fl.mark == skb->mark &&
  		    rth->fl.fl4_tos == tos) {
-@@ -1995,7 +2018,19 @@ int ip_route_input(struct sk_buff *skb, 
+@@ -1995,7 +2018,19 @@
  		rcu_read_unlock();
  		return -EINVAL;
  	}
@@ -232,7 +226,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  }
  
  static inline int __mkroute_output(struct rtable **result,
-@@ -2067,6 +2102,7 @@ static inline int __mkroute_output(struc
+@@ -2067,6 +2102,7 @@
  	rth->fl.fl4_tos	= tos;
  	rth->fl.fl4_src	= oldflp->fl4_src;
  	rth->fl.oif	= oldflp->oif;
@@ -240,7 +234,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  	rth->fl.mark    = oldflp->mark;
  	rth->rt_dst	= fl->fl4_dst;
  	rth->rt_src	= fl->fl4_src;
-@@ -2145,6 +2181,7 @@ static int ip_route_output_slow(struct r
+@@ -2145,6 +2181,7 @@
  	struct flowi fl = { .nl_u = { .ip4_u =
  				      { .daddr = oldflp->fl4_dst,
  					.saddr = oldflp->fl4_src,
@@ -248,7 +242,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  					.tos = tos & IPTOS_RT_MASK,
  					.scope = ((tos & RTO_ONLINK) ?
  						  RT_SCOPE_LINK :
-@@ -2248,6 +2285,7 @@ static int ip_route_output_slow(struct r
+@@ -2248,6 +2285,7 @@
  		dev_out = &loopback_dev;
  		dev_hold(dev_out);
  		fl.oif = loopback_dev.ifindex;
@@ -256,7 +250,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  		res.type = RTN_LOCAL;
  		flags |= RTCF_LOCAL;
  		goto make_route;
-@@ -2255,7 +2293,7 @@ static int ip_route_output_slow(struct r
+@@ -2255,7 +2293,7 @@
  
  	if (fib_lookup(&fl, &res)) {
  		res.fi = NULL;
@@ -265,7 +259,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  			/* Apparently, routing tables are wrong. Assume,
  			   that the destination is on link.
  
-@@ -2295,6 +2333,7 @@ static int ip_route_output_slow(struct r
+@@ -2295,6 +2333,7 @@
  		dev_out = &loopback_dev;
  		dev_hold(dev_out);
  		fl.oif = dev_out->ifindex;
@@ -273,7 +267,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  		if (res.fi)
  			fib_info_put(res.fi);
  		res.fi = NULL;
-@@ -2302,13 +2341,12 @@ static int ip_route_output_slow(struct r
+@@ -2302,13 +2341,12 @@
  		goto make_route;
  	}
  
@@ -290,7 +284,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  
  	if (!fl.fl4_src)
  		fl.fl4_src = FIB_RES_PREFSRC(res);
-@@ -2345,6 +2383,7 @@ int __ip_route_output_key(struct rtable 
+@@ -2345,6 +2383,7 @@
  		    rth->fl.fl4_src == flp->fl4_src &&
  		    rth->fl.iif == 0 &&
  		    rth->fl.oif == flp->oif &&
@@ -298,7 +292,7 @@ Index: linux-2.6.23.17/net/ipv4/route.c
  		    rth->fl.mark == flp->mark &&
  		    !((rth->fl.fl4_tos ^ flp->fl4_tos) &
  			    (IPTOS_RT_MASK | RTO_ONLINK))) {
-@@ -3030,3 +3069,4 @@ int __init ip_rt_init(void)
+@@ -3030,3 +3069,4 @@
  EXPORT_SYMBOL(__ip_select_ident);
  EXPORT_SYMBOL(ip_route_input);
  EXPORT_SYMBOL(ip_route_output_key);