lkml.org 
[lkml]   [2017]   [Aug]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 13/16] revert "ipv4: Should use consistent conditional judgement for ip fragment in __ip_append_data and ip_finish_output"
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    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 | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/net/ipv4/ip_output.c
    +++ b/net/ipv4/ip_output.c
    @@ -936,7 +936,7 @@ static int __ip_append_data(struct sock
    csummode = CHECKSUM_PARTIAL;

    cork->length += length;
    - if ((((length + fragheaderlen) > mtu) || (skb && skb_is_gso(skb))) &&
    + if (((length > mtu) || (skb && skb_is_gso(skb))) &&
    (sk->sk_protocol == IPPROTO_UDP) &&
    (rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len &&
    (sk->sk_type == SOCK_DGRAM) && !sk->sk_no_check_tx) {

    \
     
     \ /
      Last update: 2017-08-12 00:03    [W:2.614 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site