[adm5120] add button devices to several boards

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

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 b6b3591..a13bb19 100644 (file)
--- 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,7 +1,5 @@
-Index: linux-2.6.23-rc6/include/linux/rtnetlink.h
-===================================================================
---- linux-2.6.23-rc6.orig/include/linux/rtnetlink.h    2007-09-21 16:23:53.000000000 +0800
-+++ linux-2.6.23-rc6/include/linux/rtnetlink.h 2007-09-21 16:24:04.000000000 +0800
+--- 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  */
@@ -11,10 +9,8 @@ Index: linux-2.6.23-rc6/include/linux/rtnetlink.h
  
  /* Macros to handle hexthops */
  
-Index: linux-2.6.23-rc6/include/net/flow.h
-===================================================================
---- linux-2.6.23-rc6.orig/include/net/flow.h   2007-09-21 16:23:53.000000000 +0800
-+++ linux-2.6.23-rc6/include/net/flow.h        2007-09-21 16:24:04.000000000 +0800
+--- a/include/net/flow.h
++++ b/include/net/flow.h
 @@ -19,6 +19,8 @@
                struct {
                        __be32                  daddr;
@@ -33,10 +29,8 @@ Index: linux-2.6.23-rc6/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-rc6/net/ipv4/route.c
-===================================================================
---- linux-2.6.23-rc6.orig/net/ipv4/route.c     2007-09-21 16:23:53.000000000 +0800
-+++ linux-2.6.23-rc6/net/ipv4/route.c  2007-09-21 16:24:04.000000000 +0800
+--- a/net/ipv4/route.c
++++ b/net/ipv4/route.c
 @@ -1116,6 +1116,7 @@
  
                                /* Gateway is different ... */
@@ -298,7 +292,7 @@ Index: linux-2.6.23-rc6/net/ipv4/route.c
                    rth->fl.mark == flp->mark &&
                    !((rth->fl.fl4_tos ^ flp->fl4_tos) &
                            (IPTOS_RT_MASK | RTO_ONLINK))) {
-@@ -3034,3 +3073,4 @@
+@@ -3030,3 +3069,4 @@
  EXPORT_SYMBOL(__ip_select_ident);
  EXPORT_SYMBOL(ip_route_input);
  EXPORT_SYMBOL(ip_route_output_key);