generic/4.0: fix error during kernel patch application
authorSteven Barth <cyrus@openwrt.org>
Wed, 20 May 2015 19:23:33 +0000 (19:23 +0000)
committerSteven Barth <cyrus@openwrt.org>
Wed, 20 May 2015 19:23:33 +0000 (19:23 +0000)
commit159f6d4945ac6ce3e48457970a571b3071771655
tree6056f01f3114d442f09df76dc32fd6a6ad03806b
parentabaff104e1d788eb528c2acbcf4f8973535929d8
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@codeaurora.org>
SVN-Revision: 45705
target/linux/generic/patches-4.0/667-ipv6-Fixed-source-specific-default-route-handling.patch