Commit 8b3f9133 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

include/net/sock.h
  commit 8f905c0e ("inet: fully convert sk->sk_rx_dst to RCU rules")
  commit 43f51df4 ("net: move early demux fields close to sk_refcnt")
  https://lore.kernel.org/all/20211222141641.0caa0ab3@canb.auug.org.au/



Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f2b551fa 391e5975

Documentation/networking/bonding.rst

+6 −5
Original line number Diff line number Diff line
@@ -196,11 +196,12 @@ ad_actor_sys_prio 
ad_actor_system



	In an AD system, this specifies the mac-address for the actor in

	protocol packet exchanges (LACPDUs). The value cannot be NULL or

	multicast. It is preferred to have the local-admin bit set for this

	mac but driver does not enforce it. If the value is not given then

	system defaults to using the masters' mac address as actors' system

	address.

	protocol packet exchanges (LACPDUs). The value cannot be a multicast

	address. If the all-zeroes MAC is specified, bonding will internally

	use the MAC of the bond itself. It is preferred to have the

	local-admin bit set for this mac but driver does not enforce it. If

	the value is not given then system defaults to using the masters'

	mac address as actors' system address.



	This parameter has effect only in 802.3ad mode and is available through

	SysFs interface.

Documentation/networking/device_drivers/ethernet/freescale/dpaa2/overview.rst

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ PHY and allows physical transmission and reception of Ethernet frames. 
  IRQ config, enable, reset



DPNI (Datapath Network Interface)

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Contains TX/RX queues, network interface configuration, and RX buffer pool

configuration mechanisms.  The TX/RX queues are in memory and are identified

by queue number.

Documentation/networking/timestamping.rst

+2 −2
Original line number Diff line number Diff line
@@ -582,8 +582,8 @@ Time stamps for outgoing packets are to be generated as follows: 
  and hardware timestamping is not possible (SKBTX_IN_PROGRESS not set).

- As soon as the driver has sent the packet and/or obtained a

  hardware time stamp for it, it passes the time stamp back by

  calling skb_hwtstamp_tx() with the original skb, the raw

  hardware time stamp. skb_hwtstamp_tx() clones the original skb and

  calling skb_tstamp_tx() with the original skb, the raw

  hardware time stamp. skb_tstamp_tx() clones the original skb and

  adds the timestamps, therefore the original skb has to be freed now.

  If obtaining the hardware time stamp somehow fails, then the driver

  should not fall back to software time stamping. The rationale is that

drivers/net/bonding/bond_options.c

+1 −1
Original line number Diff line number Diff line
@@ -1554,7 +1554,7 @@ static int bond_option_ad_actor_system_set(struct bonding *bond, 
		mac = (u8 *)&newval->value;

	}



	if (!is_valid_ether_addr(mac))

	if (is_multicast_ether_addr(mac))

		goto err;



	netdev_dbg(bond->dev, "Setting ad_actor_system to %pM\n", mac);

drivers/net/ethernet/intel/ice/ice_base.c

+17 −0
Original line number Diff line number Diff line
@@ -6,6 +6,18 @@ 
#include "ice_lib.h"

#include "ice_dcb_lib.h"



static bool ice_alloc_rx_buf_zc(struct ice_rx_ring *rx_ring)

{

	rx_ring->xdp_buf = kcalloc(rx_ring->count, sizeof(*rx_ring->xdp_buf), GFP_KERNEL);

	return !!rx_ring->xdp_buf;

}



static bool ice_alloc_rx_buf(struct ice_rx_ring *rx_ring)

{

	rx_ring->rx_buf = kcalloc(rx_ring->count, sizeof(*rx_ring->rx_buf), GFP_KERNEL);

	return !!rx_ring->rx_buf;

}



/**

 * __ice_vsi_get_qs_contig - Assign a contiguous chunk of queues to VSI

 * @qs_cfg: gathered variables needed for PF->VSI queues assignment
@@ -492,8 +504,11 @@ int ice_vsi_cfg_rxq(struct ice_rx_ring *ring) 
			xdp_rxq_info_reg(&ring->xdp_rxq, ring->netdev,

					 ring->q_index, ring->q_vector->napi.napi_id);



		kfree(ring->rx_buf);

		ring->xsk_pool = ice_xsk_pool(ring);

		if (ring->xsk_pool) {

			if (!ice_alloc_rx_buf_zc(ring))

				return -ENOMEM;

			xdp_rxq_info_unreg_mem_model(&ring->xdp_rxq);



			ring->rx_buf_len =
@@ -508,6 +523,8 @@ int ice_vsi_cfg_rxq(struct ice_rx_ring *ring) 
			dev_info(dev, "Registered XDP mem model MEM_TYPE_XSK_BUFF_POOL on Rx ring %d\n",

				 ring->q_index);

		} else {

			if (!ice_alloc_rx_buf(ring))

				return -ENOMEM;

			if (!xdp_rxq_info_is_reg(&ring->xdp_rxq))

				/* coverity[check_return] */

				xdp_rxq_info_reg(&ring->xdp_rxq,