lkml.org 
[lkml]   [2014]   [Aug]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 01/94] Revert "net: ipv4: ip_forward: fix inverted local_df test"
    3.2.62-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Ben Hutchings <ben@decadent.org.uk>

    This reverts commit 59d9f389df3cdf72833d5ee17c3fe959b6bdc792, which
    was commit ca6c5d4ad216d5942ae544bbf02503041bd802aa upstream. It is a
    valid fix, but depends on sk_buff::local_df being set in all the right
    cases, which it wasn't in 3.2. We need to defer it unless and until
    the other fixes are also backported to 3.2.y.

    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    net/ipv4/ip_forward.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/net/ipv4/ip_forward.c
    +++ b/net/ipv4/ip_forward.c
    @@ -42,12 +42,12 @@
    static bool ip_may_fragment(const struct sk_buff *skb)
    {
    return unlikely((ip_hdr(skb)->frag_off & htons(IP_DF)) == 0) ||
    - skb->local_df;
    + !skb->local_df;
    }

    static bool ip_exceeds_mtu(const struct sk_buff *skb, unsigned int mtu)
    {
    - if (skb->len <= mtu)
    + if (skb->len <= mtu || skb->local_df)
    return false;

    if (skb_is_gso(skb) && skb_gso_network_seglen(skb) <= mtu)


    \
     
     \ /
      Last update: 2014-08-04 20:01    [W:4.178 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site