From: David S. Miller <davem@davemloft.net>
Date: Tue, 21 Jul 2020 01:07:39 +0000 (-0700)
Subject: Merge branch 'net-atlantic-various-features'
X-Git-Tag: v5.9-rc1~133^2~183
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f1b4da541db2bc99d5783ebf2b60c1563eb9077;p=thirdparty%2Flinux.git

Merge branch 'net-atlantic-various-features'

Mark Starovoytov says:

====================
net: atlantic: various features

This patchset adds more features for Atlantic NICs:
 * media detect;
 * additional per-queue stats;
 * PTP stats;
 * ipv6 support for TCP LSO and UDP GSO;
 * 64-bit operations;
 * A0 ntuple filters;
 * MAC temperature (hwmon).

This work is a joint effort of Marvell developers.

v3:
 * reworked patches related to stats:
   . fixed u64_stats_update_* usage;
   . use simple assignment in _get_stats / _fill_stats_data;
   . made _get_sw_stats / _fill_stats_data return count as return value;
   . split rx and tx per-queue stats;

v2: https://patchwork.ozlabs.org/cover/1329652/
 * removed media detect feature (will be reworked and submitted later);
 * removed irq counter from stats;
 * use u64_stats_update_* to protect 64-bit stats;
 * use io-64-nonatomic-lo-hi.h for readq/writeq fallbacks;

v1: https://patchwork.ozlabs.org/cover/1327894/
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

4f1b4da541db2bc99d5783ebf2b60c1563eb9077