| commit | 4688f042599f8eabe45713f7d5e88a4da5a89765 | |
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| Fri, 11 Aug 2017 16:19:02 +0000 (11 09:19 -0700) | ||
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| Sun, 13 Aug 2017 02:31:22 +0000 (12 19:31 -0700) | ||
| tree | 844db72e3c57c9633ba3ff32e48f0f109b2c6dcc | treesnapshot (tar.gz zip) |
| parent | 53eed8aadc58a5c2b1563d8755d8546c88222f0c | commitdiff |
revert "ipv4: Should use consistent conditional judgement for ip fragment in __ip_append_data and ip_finish_output"
This reverts commit f102bb7164c9020e12662998f0fd99c3be72d4f6 which is
commit 0a28cfd51e17f4f0a056bcf66bfbe492c3b99f38 upstream as there is
another patch that needs to be applied instead of this one.
Cc: Zheng Li <james.z.li@ericsson.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This reverts commit f102bb7164c9020e12662998f0fd99c3be72d4f6 which is
commit 0a28cfd51e17f4f0a056bcf66bfbe492c3b99f38 upstream as there is
another patch that needs to be applied instead of this one.
Cc: Zheng Li <james.z.li@ericsson.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| net/ipv4/ip_output.c | diffblobblamehistory |