Changeset 45705


Ignore:
Timestamp:
2015-05-20T21:23:33+02:00 (3 years ago)
Author:
cyrus
Message:

generic/4.0: fix error during kernel patch application

Commit 5168c9a5702648eb690d32ec821647aca80aeba9 introduced a regression
during patch application on the 4.0 kernel. Some of the patched content
doesn't match the actual code, therefore leading to the following error:

Applying patch generic/667-ipv6-Fixed-source-specific-default-route-handling.patch
patching file net/ipv6/ip6_output.c
Hunk #1 FAILED at 886.
1 out of 1 hunk FAILED -- rejects in file net/ipv6/ip6_output.c
patching file net/ipv6/route.c
Hunk #1 succeeded at 2247 (offset 2 lines).
Patch generic/667-ipv6-Fixed-source-specific-default-route-handling.patch does not apply (enforce with -f)

This change just adapts the actual patch to fix what is in kernel 4.0
and make it apply cleanly.

Signed-off-by: Mathieu Olivari <mathieu@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-4.0/667-ipv6-Fixed-source-specific-default-route-handling.patch

    r45699 r45705  
    2525 2 files changed, 34 insertions(+), 10 deletions(-) 
    2626 
    27 diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c 
    28 index 7fde1f2..c217775 100644 
    2927--- a/net/ipv6/ip6_output.c 
    3028+++ b/net/ipv6/ip6_output.c 
    31 @@ -886,22 +886,45 @@ static int ip6_dst_lookup_tail(struct sock *sk, 
     29@@ -883,22 +883,45 @@ static int ip6_dst_lookup_tail(struct so 
    3230 #endif 
    3331        int err; 
    3432  
    35 -       if (!*dst) 
     33-       if (*dst == NULL) 
    3634-               *dst = ip6_route_output(net, sk, fl6); 
    3735- 
     
    8381        /* 
    8482         * Here if the dst entry we've looked up 
    85 diff --git a/net/ipv6/route.c b/net/ipv6/route.c 
    86 index 5c48293..d358888 100644 
    8783--- a/net/ipv6/route.c 
    8884+++ b/net/ipv6/route.c 
    89 @@ -2245,9 +2245,10 @@ int ip6_route_get_saddr(struct net *net, 
     85@@ -2247,9 +2247,10 @@ int ip6_route_get_saddr(struct net *net, 
    9086                        unsigned int prefs, 
    9187                        struct in6_addr *saddr) 
     
    10096        else 
    10197                err = ipv6_dev_get_saddr(net, idev ? idev->dev : NULL, 
    102 --  
    103 2.1.4 
    104  
Note: See TracChangeset for help on using the changeset viewer.