Merge branch ‘ieee802154-for-davem-2019-04-25’ of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan [Linux 5.1]

Merge branch ‘ieee802154-for-davem-2019-04-25’ of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan [Linux 5.1]

This Linux kernel change "Merge branch ‘ieee802154-for-davem-2019-04-25’ of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan" is included in the Linux 5.1 release. This change is authored by David S. Miller <davem [at] davemloft.net> on Mon Apr 29 18:18:09 2019 -0400. The commit for this change in Linux stable tree is 6ee12b7 (patch). Other info about this change: Merge: 2ae7a39 22e8860

Merge branch 'ieee802154-for-davem-2019-04-25' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan

Stefan Schmidt says:

====================
ieee802154 for net 2019-04-25

An update from ieee802154 for your *net* tree.

Another fix from Kangjie Lu to ensure better checking regmap updates in the
mcr20a driver. Nothing else I have pending for the final release.

If there are any problems let me know.
====================

Signed-off-by: David S. Miller <[email protected]>

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 net/ipv4/udp_offload.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c
index 64f9715..d8776b2 100644
--- a/net/ipv4/udp_offload.c
+++ b/net/ipv4/udp_offload.c
@@ -377,13 +377,14 @@ static struct sk_buff *udp_gro_receive_segment(struct list_head *head,

        /* Terminate the flow on len mismatch or if it grow "too much".
         * Under small packet flood GRO count could elsewhere grow a lot
-        * leading to execessive truesize values
+        * leading to execessive truesize values.
+        * On len mismatch merge the first packet shorter than gso_size,
+        * otherwise complete the GRO packet.
         */
-       if (!skb_gro_receive(p, skb) &&
+       if (uh->len > uh2->len || skb_gro_receive(p, skb) ||
+           uh->len != uh2->len ||
            NAPI_GRO_CB(p)->count >= UDP_GRO_CNT_MAX)
            pp = p;
-       else if (uh->len != uh2->len)
-           pp = p;

        return pp;
    }

Leave a Reply

Your email address will not be published. Required fields are marked *