Commit c58c18be authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Merge in late fixes to prepare for the 6.17 net-next PR.

Conflicts:

net/core/neighbour.c
  1bbb76a8 ("neighbour: Fix null-ptr-deref in neigh_flush_dev().")
  13a936bb ("neighbour: Protect tbl->phash_buckets[] with a dedicated mutex.")
  03dc03fa ("neighbor: Add NTF_EXT_VALIDATED flag for externally validated entries")

Adjacent changes:

drivers/net/usb/usbnet.c
  0d9cfc9b ("net: usbnet: Avoid potential RCU stall on LINK_CHANGE event")
  2c04d279 ("net: usb: Convert tasklet API to new bottom half workqueue mechanism")

net/ipv6/route.c
  31d7d67b ("ipv6: annotate data-races around rt->fib6_nsiblings")
  1caf2729 ("ipv6: adopt dst_dev() helper")
  3b3ccf9e ("net: Remove unnecessary NULL check for lwtunnel_fill_encap()")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents c471b90b afd8c2c9

drivers/net/can/usb/peak_usb/pcan_usb_fd.c

+9 −8
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ struct __packed pcan_ufd_fw_info { 
	__le32	ser_no;		/* S/N */

	__le32	flags;		/* special functions */



	/* extended data when type == PCAN_USBFD_TYPE_EXT */

	/* extended data when type >= PCAN_USBFD_TYPE_EXT */

	u8	cmd_out_ep;	/* ep for cmd */

	u8	cmd_in_ep;	/* ep for replies */

	u8	data_out_ep[2];	/* ep for CANx TX */
@@ -982,10 +982,11 @@ static int pcan_usb_fd_init(struct peak_usb_device *dev) 
			dev->can.ctrlmode |= CAN_CTRLMODE_FD_NON_ISO;

		}



		/* if vendor rsp is of type 2, then it contains EP numbers to

		 * use for cmds pipes. If not, then default EP should be used.

		/* if vendor rsp type is greater than or equal to 2, then it

		 * contains EP numbers to use for cmds pipes. If not, then

		 * default EP should be used.

		 */

		if (fw_info->type != cpu_to_le16(PCAN_USBFD_TYPE_EXT)) {

		if (le16_to_cpu(fw_info->type) < PCAN_USBFD_TYPE_EXT) {

			fw_info->cmd_out_ep = PCAN_USBPRO_EP_CMDOUT;

			fw_info->cmd_in_ep = PCAN_USBPRO_EP_CMDIN;

		}
@@ -1018,11 +1019,11 @@ static int pcan_usb_fd_init(struct peak_usb_device *dev) 
	dev->can_channel_id =

		le32_to_cpu(pdev->usb_if->fw_info.dev_id[dev->ctrl_idx]);



	/* if vendor rsp is of type 2, then it contains EP numbers to

	 * use for data pipes. If not, then statically defined EP are used

	 * (see peak_usb_create_dev()).

	/* if vendor rsp type is greater than or equal to 2, then it contains EP

	 * numbers to use for data pipes. If not, then statically defined EP are

	 * used (see peak_usb_create_dev()).

	 */

	if (fw_info->type == cpu_to_le16(PCAN_USBFD_TYPE_EXT)) {

	if (le16_to_cpu(fw_info->type) >= PCAN_USBFD_TYPE_EXT) {

		dev->ep_msg_in = fw_info->data_in_ep;

		dev->ep_msg_out = fw_info->data_out_ep[dev->ctrl_idx];

	}

drivers/net/dsa/microchip/ksz8.c

+3 −0
Original line number Diff line number Diff line
@@ -384,6 +384,9 @@ static void ksz8863_r_mib_pkt(struct ksz_device *dev, int port, u16 addr, 
	addr -= dev->info->reg_mib_cnt;

	ctrl_addr = addr ? KSZ8863_MIB_PACKET_DROPPED_TX_0 :

			   KSZ8863_MIB_PACKET_DROPPED_RX_0;

	if (ksz_is_8895_family(dev) &&

	    ctrl_addr == KSZ8863_MIB_PACKET_DROPPED_RX_0)

		ctrl_addr = KSZ8895_MIB_PACKET_DROPPED_RX_0;

	ctrl_addr += port;

	ctrl_addr |= IND_ACC_TABLE(TABLE_MIB | TABLE_READ);

drivers/net/dsa/microchip/ksz8_reg.h

+3 −1
Original line number Diff line number Diff line
@@ -833,7 +833,9 @@ 
#define KSZ8795_MIB_TOTAL_TX_1		0x105



#define KSZ8863_MIB_PACKET_DROPPED_TX_0 0x100

#define KSZ8863_MIB_PACKET_DROPPED_RX_0 0x105

#define KSZ8863_MIB_PACKET_DROPPED_RX_0 0x103



#define KSZ8895_MIB_PACKET_DROPPED_RX_0 0x105



#define MIB_PACKET_DROPPED		0x0000FFFF

drivers/net/ethernet/intel/igb/igb_xsk.c

+1 −2
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ bool igb_xmit_zc(struct igb_ring *tx_ring, struct xsk_buff_pool *xsk_pool) 
	if (!nb_pkts)

		return true;



	while (nb_pkts-- > 0) {

	for (; i < nb_pkts; i++) {

		dma = xsk_buff_raw_get_dma(xsk_pool, descs[i].addr);

		xsk_buff_raw_dma_sync_for_device(xsk_pool, dma, descs[i].len);
@@ -512,7 +512,6 @@ bool igb_xmit_zc(struct igb_ring *tx_ring, struct xsk_buff_pool *xsk_pool) 


		total_bytes += descs[i].len;



		i++;

		tx_ring->next_to_use++;

		tx_buffer_info->next_to_watch = tx_desc;

		if (tx_ring->next_to_use == tx_ring->count)

drivers/net/ethernet/mellanox/mlx5/core/en.h

+1 −0
Original line number Diff line number Diff line
@@ -726,6 +726,7 @@ struct mlx5e_rq { 
	struct xsk_buff_pool  *xsk_pool;



	struct work_struct     recover_work;

	struct work_struct     rx_timeout_work;



	/* control */

	struct mlx5_wq_ctrl    wq_ctrl;