From: David S. Miller Date: Mon, 13 Feb 2023 11:05:12 +0000 (+0000) Subject: Merge branch 'ionic-on-chip-desc' X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=79cdf17e5131ccdee0792f6f25d3db0e34861998;p=users%2Fjedix%2Flinux-maple.git Merge branch 'ionic-on-chip-desc' Shannon Nelson says: ==================== ionic: on-chip descriptors We start with a couple of house-keeping patches that were originally presented for 'net', then we add support for on-chip descriptor rings for tx-push, as well as adding support for rx-push. I have a patch for the ethtool userland utility that I can send out once this has been accepted. v4: added rx-push attributes to ethtool netlink converted CMB feature from using a priv-flag to using ethtool tx/rx-push v3: edited commit message to describe interface-down limitation added warn msg if cmb_inuse alloc fails removed unnecessary clearing of phy_cmb_pages and cmb_npages changed cmb_rings_toggle to use cmb_inuse removed unrelated pci_set_drvdata() removed unnecessary (u32) cast added static inline func for writing CMB descriptors v2: dropped the rx buffers patch ==================== Signed-off-by: David S. Miller --- 79cdf17e5131ccdee0792f6f25d3db0e34861998