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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)
  tg3: Fix single-vector MSI-X code
  openvswitch: Fix multipart datapath dumps.
  ipv6: fix per device IP snmp counters
  inetpeer: initialize ->redirect_genid in inet_getpeer()
  net: fix NULL-deref in WARN() in skb_gso_segment()
  net: WARN if skb_checksum_help() is called on skb requiring segmentation
  caif: Remove bad WARN_ON in caif_dev
  caif: Fix typo in Vendor/Product-ID for CAIF modems
  bnx2x: Disable AN KR work-around for BCM57810
  bnx2x: Remove AutoGrEEEn for BCM84833
  bnx2x: Remove 100Mb force speed for BCM84833
  bnx2x: Fix PFC setting on BCM57840
  bnx2x: Fix Super-Isolate mode for BCM84833
  net: fix some sparse errors
  net: kill duplicate included header
  net: sh-eth: Fix build error by the value which is not defined
  net: Use device model to get driver name in skb_gso_segment()
  bridge: BH already disabled in br_fdb_cleanup()
  net: move sock_update_memcg outside of CONFIG_INET
  mwl8k: Fixing Sparse ENDIAN CHECK warning
  ...

3 files changed, 22 insertions, 14 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index f494675471a9..115dee1d985d 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1887,6 +1887,23 @@ void skb_set_dev(struct sk_buff *skb, struct net_device *dev)
 EXPORT_SYMBOL(skb_set_dev);
 #endif /* CONFIG_NET_NS */
 
+static void skb_warn_bad_offload(const struct sk_buff *skb)
+{
+        static const netdev_features_t null_features = 0;
+        struct net_device *dev = skb->dev;
+        const char *driver = "";
+
+        if (dev && dev->dev.parent)
+                driver = dev_driver_string(dev->dev.parent);
+
+        WARN(1, "%s: caps=(%pNF, %pNF) len=%d data_len=%d gso_size=%d "
+             "gso_type=%d ip_summed=%d\n",
+             driver, dev ? &dev->features : &null_features,
+             skb->sk ? &skb->sk->sk_route_caps : &null_features,
+             skb->len, skb->data_len, skb_shinfo(skb)->gso_size,
+             skb_shinfo(skb)->gso_type, skb->ip_summed);
+}
+
 /*
  * Invalidate hardware checksum when packet is to be mangled, and
  * complete checksum manually on outgoing path.
@@ -1900,8 +1917,8 @@ int skb_checksum_help(struct sk_buff *skb)
                 goto out_set_summed;
 
         if (unlikely(skb_shinfo(skb)->gso_size)) {
-                /* Let GSO fix up the checksum. */
-                goto out_set_summed;
+                skb_warn_bad_offload(skb);
+                return -EINVAL;
         }
 
         offset = skb_checksum_start_offset(skb);
@@ -1961,16 +1978,7 @@ struct sk_buff *skb_gso_segment(struct sk_buff *skb,
         __skb_pull(skb, skb->mac_len);
 
         if (unlikely(skb->ip_summed != CHECKSUM_PARTIAL)) {
-                struct net_device *dev = skb->dev;
-                struct ethtool_drvinfo info = {};
-
-                if (dev && dev->ethtool_ops && dev->ethtool_ops->get_drvinfo)
-                        dev->ethtool_ops->get_drvinfo(dev, &info);
-
-                WARN(1, "%s: caps=(%pNF, %pNF) len=%d data_len=%d ip_summed=%d\n",
-                     info.driver, dev ? &dev->features : NULL,
-                     skb->sk ? &skb->sk->sk_route_caps : NULL,
-                     skb->len, skb->data_len, skb->ip_summed);
+                skb_warn_bad_offload(skb);
 
                 if (skb_header_cloned(skb) &&
                     (err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC)))
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index f3dbd4f596a4..a1727cda03d7 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -929,7 +929,7 @@ static ssize_t bql_show_inflight(struct netdev_queue *queue,
 }
 
 static struct netdev_queue_attribute bql_inflight_attribute =
-        __ATTR(inflight, S_IRUGO | S_IWUSR, bql_show_inflight, NULL);
+        __ATTR(inflight, S_IRUGO, bql_show_inflight, NULL);
 
 #define BQL_ATTR(NAME, FIELD)                                           \
 static ssize_t bql_show_ ## NAME(struct netdev_queue *queue,            \
diff --git a/net/core/secure_seq.c b/net/core/secure_seq.c
index 6fd44606fdd1..99b2596531bb 100644
--- a/net/core/secure_seq.c
+++ b/net/core/secure_seq.c
@@ -46,7 +46,7 @@ __u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr,
 
         memcpy(hash, saddr, 16);
         for (i = 0; i < 4; i++)
-                secret[i] = net_secret[i] + daddr[i];
+                secret[i] = net_secret[i] + (__force u32)daddr[i];
         secret[4] = net_secret[4] +
                 (((__force u16)sport << 16) + (__force u16)dport);
         for (i = 5; i < MD5_MESSAGE_BYTES / 4; i++)