Commit f1455695 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

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



Cross-merge networking fixes after downstream PR (net-6.17-rc8).

Conflicts:

tools/testing/selftests/drivers/net/bonding/Makefile
  87951b56 selftests: bonding: add test for passive LACP mode
  c2377f17 selftests: bonding: add test for LACP actor port priority

Adjacent changes:

drivers/net/ethernet/cadence/macb.h
  fca3dc85 net: macb: remove illusion about TBQPH/RBQPH being per-queue
  89934dbf net: macb: Add TAPRIO traffic scheduling support

drivers/net/ethernet/cadence/macb_main.c
  fca3dc85 net: macb: remove illusion about TBQPH/RBQPH being per-queue
  89934dbf net: macb: Add TAPRIO traffic scheduling support

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 936f160a daa26ea6

Documentation/devicetree/bindings/net/cdns,macb.yaml

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ properties: 
    items:

      - enum: [ ether_clk, hclk, pclk ]

      - enum: [ hclk, pclk ]

      - const: tx_clk

      - enum: [ tx_clk, tsu_clk ]

      - enum: [ rx_clk, tsu_clk ]

      - const: tsu_clk

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -4313,7 +4313,7 @@ void bond_work_init_all(struct bonding *bond) 
	INIT_DELAYED_WORK(&bond->slave_arr_work, bond_slave_arr_handler);

}



static void bond_work_cancel_all(struct bonding *bond)

void bond_work_cancel_all(struct bonding *bond)

{

	cancel_delayed_work_sync(&bond->mii_work);

	cancel_delayed_work_sync(&bond->arp_work);

drivers/net/bonding/bond_netlink.c

+9 −7
Original line number Diff line number Diff line
@@ -593,20 +593,22 @@ static int bond_newlink(struct net_device *bond_dev, 
			struct rtnl_newlink_params *params,

			struct netlink_ext_ack *extack)

{

	struct bonding *bond = netdev_priv(bond_dev);

	struct nlattr **data = params->data;

	struct nlattr **tb = params->tb;

	int err;



	err = bond_changelink(bond_dev, tb, data, extack);

	if (err < 0)

		return err;



	err = register_netdevice(bond_dev);

	if (!err) {

		struct bonding *bond = netdev_priv(bond_dev);

	if (err)

		return err;



	netif_carrier_off(bond_dev);

	bond_work_init_all(bond);



	err = bond_changelink(bond_dev, tb, data, extack);

	if (err) {

		bond_work_cancel_all(bond);

		unregister_netdevice(bond_dev);

	}



	return err;

drivers/net/ethernet/amazon/ena/ena_ethtool.c

+4 −1
Original line number Diff line number Diff line
@@ -865,7 +865,10 @@ static u32 ena_get_rxfh_indir_size(struct net_device *netdev) 


static u32 ena_get_rxfh_key_size(struct net_device *netdev)

{

	return ENA_HASH_KEY_SIZE;

	struct ena_adapter *adapter = netdev_priv(netdev);

	struct ena_rss *rss = &adapter->ena_dev->rss;



	return rss->hash_key ? ENA_HASH_KEY_SIZE : 0;

}



static int ena_indirection_table_set(struct ena_adapter *adapter,

drivers/net/ethernet/cadence/macb.h

+0 −4
Original line number Diff line number Diff line
@@ -220,10 +220,8 @@ 


#define GEM_ISR(hw_q)		(0x0400 + ((hw_q) << 2))

#define GEM_TBQP(hw_q)		(0x0440 + ((hw_q) << 2))

#define GEM_TBQPH(hw_q)		(0x04C8)

#define GEM_RBQP(hw_q)		(0x0480 + ((hw_q) << 2))

#define GEM_RBQS(hw_q)		(0x04A0 + ((hw_q) << 2))

#define GEM_RBQPH(hw_q)		(0x04D4)

#define GEM_IER(hw_q)		(0x0600 + ((hw_q) << 2))

#define GEM_IDR(hw_q)		(0x0620 + ((hw_q) << 2))

#define GEM_IMR(hw_q)		(0x0640 + ((hw_q) << 2))
@@ -1246,10 +1244,8 @@ struct macb_queue { 
	unsigned int		IDR;

	unsigned int		IMR;

	unsigned int		TBQP;

	unsigned int		TBQPH;

	unsigned int		RBQS;

	unsigned int		RBQP;

	unsigned int		RBQPH;



	/* ENST register offsets for this queue */

	unsigned int		ENST_START_TIME;