Commit 5ad3dbab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Jakub Kicinski:
 "Rather small batch this time.

  Current release - regressions:

   - bcm63xx_enet: fix sporadic kernel panic due to queue length
     mis-accounting

  Current release - new code bugs:

   - bcm4908_enet: fix RX path possible mem leak

   - bcm4908_enet: fix NAPI poll returned value

   - stmmac: fix missing spin_lock_init in visconti_eth_dwmac_probe()

   - sched: cls_flower: validate ct_state for invalid and reply flags

  Previous releases - regressions:

   - net: introduce CAN specific pointer in the struct net_device to
     prevent mis-interpreting memory

   - phy: micrel: set soft_reset callback to genphy_soft_reset for
     KSZ8081

   - psample: fix netlink skb length with tunnel info

  Previous releases - always broken:

   - icmp: pass zeroed opts from icmp{,v6}_ndo_send before sending

   - wireguard: device: do not generate ICMP for non-IP packets

   - mptcp: provide subflow aware release function to avoid a mem leak

   - hsr: add support for EntryForgetTime

   - r8169: fix jumbo packet handling on RTL8168e

   - octeontx2-af: fix an off by one in rvu_dbg_qsize_write()

   - i40e: fix flow for IPv6 next header (extension header)

   - phy: icplus: call phy_restore_page() when phy_select_page() fails

   - dpaa_eth: fix the access method for the dpaa_napi_portal"

* tag 'net-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (55 commits)
  r8169: fix jumbo packet handling on RTL8168e
  net: phy: micrel: set soft_reset callback to genphy_soft_reset for KSZ8081
  net: psample: Fix netlink skb length with tunnel info
  net: broadcom: bcm4908_enet: fix NAPI poll returned value
  net: broadcom: bcm4908_enet: fix RX path possible mem leak
  net: hsr: add support for EntryForgetTime
  net: dsa: sja1105: Remove unneeded cast in sja1105_crc32()
  ibmvnic: fix a race between open and reset
  net: stmmac: Fix missing spin_lock_init in visconti_eth_dwmac_probe()
  net: introduce CAN specific pointer in the struct net_device
  net: usb: qmi_wwan: support ZTE P685M modem
  wireguard: kconfig: use arm chacha even with no neon
  wireguard: queueing: get rid of per-peer ring buffers
  wireguard: device: do not generate ICMP for non-IP packets
  wireguard: peer: put frequently used members above cache lines
  wireguard: selftests: test multiple parallel streams
  wireguard: socket: remove bogus __be32 annotation
  wireguard: avoid double unlikely() notation when using IS_ERR()
  net: qrtr: Fix memory leak in qrtr_tun_open
  vxlan: move debug check after netdev unregister
  ...
parents 268f77b5 6cf73913

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ config WIREGUARD 
	select CRYPTO_CURVE25519_X86 if X86 && 64BIT

	select ARM_CRYPTO if ARM

	select ARM64_CRYPTO if ARM64

	select CRYPTO_CHACHA20_NEON if (ARM || ARM64) && KERNEL_MODE_NEON

	select CRYPTO_CHACHA20_NEON if ARM || (ARM64 && KERNEL_MODE_NEON)

	select CRYPTO_POLY1305_NEON if ARM64 && KERNEL_MODE_NEON

	select CRYPTO_POLY1305_ARM if ARM

	select CRYPTO_BLAKE2S_ARM if ARM

drivers/net/can/dev/dev.c

+3 −1
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ void can_setup(struct net_device *dev) 
struct net_device *alloc_candev_mqs(int sizeof_priv, unsigned int echo_skb_max,

				    unsigned int txqs, unsigned int rxqs)

{

	struct can_ml_priv *can_ml;

	struct net_device *dev;

	struct can_priv *priv;

	int size;
@@ -270,7 +271,8 @@ struct net_device *alloc_candev_mqs(int sizeof_priv, unsigned int echo_skb_max, 
	priv = netdev_priv(dev);

	priv->dev = dev;



	dev->ml_priv = (void *)priv + ALIGN(sizeof_priv, NETDEV_ALIGN);

	can_ml = (void *)priv + ALIGN(sizeof_priv, NETDEV_ALIGN);

	can_set_ml_priv(dev, can_ml);



	if (echo_skb_max) {

		priv->echo_skb_max = echo_skb_max;

drivers/net/can/slcan.c

+3 −1
Original line number Diff line number Diff line
@@ -516,6 +516,7 @@ static struct slcan *slc_alloc(void) 
	int i;

	char name[IFNAMSIZ];

	struct net_device *dev = NULL;

	struct can_ml_priv *can_ml;

	struct slcan       *sl;

	int size;
@@ -538,7 +539,8 @@ static struct slcan *slc_alloc(void) 


	dev->base_addr  = i;

	sl = netdev_priv(dev);

	dev->ml_priv = (void *)sl + ALIGN(sizeof(*sl), NETDEV_ALIGN);

	can_ml = (void *)sl + ALIGN(sizeof(*sl), NETDEV_ALIGN);

	can_set_ml_priv(dev, can_ml);



	/* Initialize channel control data */

	sl->magic = SLCAN_MAGIC;

drivers/net/can/vcan.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static void vcan_setup(struct net_device *dev) 
	dev->addr_len		= 0;

	dev->tx_queue_len	= 0;

	dev->flags		= IFF_NOARP;

	dev->ml_priv		= netdev_priv(dev);

	can_set_ml_priv(dev, netdev_priv(dev));



	/* set flags according to driver capabilities */

	if (echo)

drivers/net/can/vxcan.c

+5 −1
Original line number Diff line number Diff line
@@ -141,6 +141,8 @@ static const struct net_device_ops vxcan_netdev_ops = { 


static void vxcan_setup(struct net_device *dev)

{

	struct can_ml_priv *can_ml;



	dev->type		= ARPHRD_CAN;

	dev->mtu		= CANFD_MTU;

	dev->hard_header_len	= 0;
@@ -149,7 +151,9 @@ static void vxcan_setup(struct net_device *dev) 
	dev->flags		= (IFF_NOARP|IFF_ECHO);

	dev->netdev_ops		= &vxcan_netdev_ops;

	dev->needs_free_netdev	= true;

	dev->ml_priv		= netdev_priv(dev) + ALIGN(sizeof(struct vxcan_priv), NETDEV_ALIGN);



	can_ml = netdev_priv(dev) + ALIGN(sizeof(struct vxcan_priv), NETDEV_ALIGN);

	can_set_ml_priv(dev, can_ml);

}



/* forward declaration for rtnl_create_link() */