Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --combined net/core/dev.c
index 55f66e1,82dc6b4..9e7f071
--- 1/net/core/dev.c
--- 2/net/core/dev.c
+++ b/net/core/dev.c
@@@ -145,6 -145,7 +145,7 @@@
  #include <linux/indirect_call_wrapper.h>
  #include <net/devlink.h>
  #include <linux/pm_runtime.h>
+ #include <linux/prandom.h>
  
  #include "net-sysfs.h"
  
@@@ -3205,7 -3206,7 +3206,7 @@@ int skb_checksum_help(struct sk_buff *s
        if (skb->ip_summed == CHECKSUM_COMPLETE)
                goto out_set_summed;
  
 -      if (unlikely(skb_shinfo(skb)->gso_size)) {
 +      if (unlikely(skb_is_gso(skb))) {
                skb_warn_bad_offload(skb);
                return -EINVAL;
        }
@@@ -3558,6 -3559,7 +3559,7 @@@ static int xmit_one(struct sk_buff *skb
                dev_queue_xmit_nit(skb, dev);
  
        len = skb->len;
+       PRANDOM_ADD_NOISE(skb, dev, txq, len + jiffies);
        trace_net_dev_start_xmit(skb, dev);
        rc = netdev_start_xmit(skb, dev, txq, more);
        trace_net_dev_xmit(skb, rc, dev, len);
@@@ -4130,6 -4132,7 +4132,7 @@@ static int __dev_queue_xmit(struct sk_b
                        if (!skb)
                                goto out;
  
+                       PRANDOM_ADD_NOISE(skb, dev, txq, jiffies);
                        HARD_TX_LOCK(dev, txq, cpu);
  
                        if (!netif_xmit_stopped(txq)) {
@@@ -4195,6 -4198,7 +4198,7 @@@ int dev_direct_xmit(struct sk_buff *skb
  
        skb_set_queue_mapping(skb, queue_id);
        txq = skb_get_tx_queue(dev, skb);
+       PRANDOM_ADD_NOISE(skb, dev, txq, jiffies);
  
        local_bh_disable();