Commit 35613731 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.12 net-next PR.

No conflicts or adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents be461814 7052622f

drivers/net/bareudp.c

+24 −2
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb) 
	__be16 proto;

	void *oiph;

	int err;

	int nh;



	bareudp = rcu_dereference_sk_user_data(sk);

	if (!bareudp)
@@ -148,10 +149,25 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb) 
	}

	skb_dst_set(skb, &tun_dst->dst);

	skb->dev = bareudp->dev;

	oiph = skb_network_header(skb);

	skb_reset_network_header(skb);

	skb_reset_mac_header(skb);



	/* Save offset of outer header relative to skb->head,

	 * because we are going to reset the network header to the inner header

	 * and might change skb->head.

	 */

	nh = skb_network_header(skb) - skb->head;



	skb_reset_network_header(skb);



	if (!pskb_inet_may_pull(skb)) {

		DEV_STATS_INC(bareudp->dev, rx_length_errors);

		DEV_STATS_INC(bareudp->dev, rx_errors);

		goto drop;

	}



	/* Get the outer header. */

	oiph = skb->head + nh;



	if (!ipv6_mod_enabled() || family == AF_INET)

		err = IP_ECN_decapsulate(oiph, skb);

	else
@@ -301,6 +317,9 @@ static int bareudp_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
	__be32 saddr;

	int err;



	if (!skb_vlan_inet_prepare(skb, skb->protocol != htons(ETH_P_TEB)))

		return -EINVAL;



	if (!sock)

		return -ESHUTDOWN;
@@ -368,6 +387,9 @@ static int bareudp6_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
	__be16 sport;

	int err;



	if (!skb_vlan_inet_prepare(skb, skb->protocol != htons(ETH_P_TEB)))

		return -EINVAL;



	if (!sock)

		return -ESHUTDOWN;

drivers/net/can/kvaser_pciefd.c

+3 −0
Original line number Diff line number Diff line
@@ -1104,6 +1104,9 @@ static int kvaser_pciefd_setup_dma(struct kvaser_pciefd *pcie) 


	/* Disable the DMA */

	iowrite32(0, KVASER_PCIEFD_SRB_ADDR(pcie) + KVASER_PCIEFD_SRB_CTRL_REG);



	dma_set_mask_and_coherent(&pcie->pci->dev, DMA_BIT_MASK(64));



	for (i = 0; i < KVASER_PCIEFD_DMA_COUNT; i++) {

		pcie->dma_data[i] = dmam_alloc_coherent(&pcie->pci->dev,

							KVASER_PCIEFD_DMA_SIZE,

drivers/net/can/m_can/m_can.c

+7 −7
Original line number Diff line number Diff line
@@ -1764,11 +1764,7 @@ static int m_can_close(struct net_device *dev) 


	netif_stop_queue(dev);



	if (!cdev->is_peripheral)

		napi_disable(&cdev->napi);



	m_can_stop(dev);

	m_can_clk_stop(cdev);

	free_irq(dev->irq, dev);



	m_can_clean(dev);
@@ -1777,10 +1773,13 @@ static int m_can_close(struct net_device *dev) 
		destroy_workqueue(cdev->tx_wq);

		cdev->tx_wq = NULL;

		can_rx_offload_disable(&cdev->offload);

	} else {

		napi_disable(&cdev->napi);

	}



	close_candev(dev);



	m_can_clk_stop(cdev);

	phy_power_off(cdev->transceiver);



	return 0;
@@ -2031,6 +2030,8 @@ static int m_can_open(struct net_device *dev) 


	if (cdev->is_peripheral)

		can_rx_offload_enable(&cdev->offload);

	else

		napi_enable(&cdev->napi);



	/* register interrupt handler */

	if (cdev->is_peripheral) {
@@ -2064,9 +2065,6 @@ static int m_can_open(struct net_device *dev) 
	if (err)

		goto exit_start_fail;



	if (!cdev->is_peripheral)

		napi_enable(&cdev->napi);



	netif_start_queue(dev);



	return 0;
@@ -2080,6 +2078,8 @@ static int m_can_open(struct net_device *dev) 
out_wq_fail:

	if (cdev->is_peripheral)

		can_rx_offload_disable(&cdev->offload);

	else

		napi_disable(&cdev->napi);

	close_candev(dev);

exit_disable_clks:

	m_can_clk_stop(cdev);

drivers/net/can/usb/esd_usb.c

+1 −5
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * CAN driver for esd electronics gmbh CAN-USB/2, CAN-USB/3 and CAN-USB/Micro

 *

 * Copyright (C) 2010-2012 esd electronic system design gmbh, Matthias Fuchs <socketcan@esd.eu>

 * Copyright (C) 2022-2023 esd electronics gmbh, Frank Jungclaus <frank.jungclaus@esd.eu>

 * Copyright (C) 2022-2024 esd electronics gmbh, Frank Jungclaus <frank.jungclaus@esd.eu>

 */



#include <linux/can.h>
@@ -1116,9 +1116,6 @@ static int esd_usb_3_set_bittiming(struct net_device *netdev) 
	if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY)

		flags |= ESD_USB_3_BAUDRATE_FLAG_LOM;



	if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES)

		flags |= ESD_USB_3_BAUDRATE_FLAG_TRS;



	baud_x->nom.brp = cpu_to_le16(nom_bt->brp & (nom_btc->brp_max - 1));

	baud_x->nom.sjw = cpu_to_le16(nom_bt->sjw & (nom_btc->sjw_max - 1));

	baud_x->nom.tseg1 = cpu_to_le16((nom_bt->prop_seg + nom_bt->phase_seg1)
@@ -1219,7 +1216,6 @@ static int esd_usb_probe_one_net(struct usb_interface *intf, int index) 
	switch (le16_to_cpu(dev->udev->descriptor.idProduct)) {

	case ESD_USB_CANUSB3_PRODUCT_ID:

		priv->can.clock.freq = ESD_USB_3_CAN_CLOCK;

		priv->can.ctrlmode_supported |= CAN_CTRLMODE_3_SAMPLES;

		priv->can.ctrlmode_supported |= CAN_CTRLMODE_FD;

		priv->can.bittiming_const = &esd_usb_3_nom_bittiming_const;

		priv->can.data_bittiming_const = &esd_usb_3_data_bittiming_const;

drivers/net/ethernet/meta/fbnic/fbnic_txrx.c

+4 −4
Original line number Diff line number Diff line
@@ -1061,14 +1061,14 @@ static int fbnic_alloc_napi_vector(struct fbnic_dev *fbd, struct fbnic_net *fbn, 
	nv->fbd = fbd;

	nv->v_idx = v_idx;



	/* Record IRQ to NAPI struct */

	netif_napi_set_irq(&nv->napi,

			   pci_irq_vector(to_pci_dev(fbd->dev), nv->v_idx));



	/* Tie napi to netdev */

	list_add(&nv->napis, &fbn->napis);

	netif_napi_add(fbn->netdev, &nv->napi, fbnic_poll);



	/* Record IRQ to NAPI struct */

	netif_napi_set_irq(&nv->napi,

			   pci_irq_vector(to_pci_dev(fbd->dev), nv->v_idx));



	/* Tie nv back to PCIe dev */

	nv->dev = fbd->dev;