Commit d717e4ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from netfilter.

  Current release - regressions:

   - llc: only change llc->dev when bind() succeeds, fix null-deref

  Current release - new code bugs:

   - smc: fix a memory leak in smc_sysctl_net_exit()

   - dsa: realtek: make interface drivers depend on OF

  Previous releases - regressions:

   - sched: act_ct: fix ref leak when switching zones

  Previous releases - always broken:

   - netfilter: egress: report interface as outgoing

   - vsock/virtio: enable VQs early on probe and finish the setup before
     using them

  Misc:

   - memcg: enable accounting for nft objects"

* tag 'net-5.18-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (39 commits)
  Revert "selftests: net: Add tls config dependency for tls selftests"
  net/smc: Send out the remaining data in sndbuf before close
  net: move net_unlink_todo() out of the header
  net: dsa: bcm_sf2_cfp: fix an incorrect NULL check on list iterator
  net: bnxt_ptp: fix compilation error
  selftests: net: Add tls config dependency for tls selftests
  memcg: enable accounting for nft objects
  net/sched: act_ct: fix ref leak when switching zones
  net/smc: fix a memory leak in smc_sysctl_net_exit()
  selftests: tls: skip cmsg_to_pipe tests with TLS=n
  octeontx2-af: initialize action variable
  net: sparx5: switchdev: fix possible NULL pointer dereference
  net/x25: Fix null-ptr-deref caused by x25_disconnect
  qlcnic: dcb: default to returning -EOPNOTSUPP
  net: sparx5: depends on PTP_1588_CLOCK_OPTIONAL
  net: hns3: fix phy can not link up when autoneg off and reset
  net: hns3: add NULL pointer check for hns3_set/get_ringparam()
  net: hns3: add netdev reset check for hns3_set_tunable()
  net: hns3: clean residual vf config after disable sriov
  net: hns3: add max order judgement for tx spare buffer
  ...
parents cffb2b72 20695e9a

drivers/net/dsa/bcm_sf2_cfp.c

+3 −3
Original line number Diff line number Diff line
@@ -567,14 +567,14 @@ static void bcm_sf2_cfp_slice_ipv6(struct bcm_sf2_priv *priv, 
static struct cfp_rule *bcm_sf2_cfp_rule_find(struct bcm_sf2_priv *priv,

					      int port, u32 location)

{

	struct cfp_rule *rule = NULL;

	struct cfp_rule *rule;



	list_for_each_entry(rule, &priv->cfp.rules_list, next) {

		if (rule->port == port && rule->fs.location == location)

			break;

			return rule;

	}



	return rule;

	return NULL;

}



static int bcm_sf2_cfp_rule_cmp(struct bcm_sf2_priv *priv, int port,

drivers/net/dsa/realtek/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ menuconfig NET_DSA_REALTEK 
config NET_DSA_REALTEK_MDIO

	tristate "Realtek MDIO connected switch driver"

	depends on NET_DSA_REALTEK

	depends on OF

	help

	  Select to enable support for registering switches configured

	  through MDIO.
@@ -19,6 +20,7 @@ config NET_DSA_REALTEK_MDIO 
config NET_DSA_REALTEK_SMI

	tristate "Realtek SMI connected switch driver"

	depends on NET_DSA_REALTEK

	depends on OF

	help

	  Select to enable support for registering switches connected

	  through SMI.

drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c

+5 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ static int bnxt_ptp_enable(struct ptp_clock_info *ptp_info, 
	struct bnxt_ptp_cfg *ptp = container_of(ptp_info, struct bnxt_ptp_cfg,

						ptp_info);

	struct bnxt *bp = ptp->bp;

	u8 pin_id;

	int pin_id;

	int rc;



	switch (rq->type) {
@@ -390,6 +390,8 @@ static int bnxt_ptp_enable(struct ptp_clock_info *ptp_info, 
		/* Configure an External PPS IN */

		pin_id = ptp_find_pin(ptp->ptp_clock, PTP_PF_EXTTS,

				      rq->extts.index);

		if (!TSIO_PIN_VALID(pin_id))

			return -EOPNOTSUPP;

		if (!on)

			break;

		rc = bnxt_ptp_cfg_pin(bp, pin_id, BNXT_PPS_PIN_PPS_IN);
@@ -403,6 +405,8 @@ static int bnxt_ptp_enable(struct ptp_clock_info *ptp_info, 
		/* Configure a Periodic PPS OUT */

		pin_id = ptp_find_pin(ptp->ptp_clock, PTP_PF_PEROUT,

				      rq->perout.index);

		if (!TSIO_PIN_VALID(pin_id))

			return -EOPNOTSUPP;

		if (!on)

			break;

drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct pps_pin { 
	u8 state;

};



#define TSIO_PIN_VALID(pin) ((pin) < (BNXT_MAX_TSIO_PINS))

#define TSIO_PIN_VALID(pin) ((pin) >= 0 && (pin) < (BNXT_MAX_TSIO_PINS))



#define EVENT_DATA2_PPS_EVENT_TYPE(data2)				\

	((data2) & ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_EVENT_TYPE)

drivers/net/ethernet/freescale/enetc/enetc_ethtool.c

+4 −1
Original line number Diff line number Diff line
@@ -674,7 +674,10 @@ static int enetc_get_ts_info(struct net_device *ndev, 
#ifdef CONFIG_FSL_ENETC_PTP_CLOCK

	info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE |

				SOF_TIMESTAMPING_RX_HARDWARE |

				SOF_TIMESTAMPING_RAW_HARDWARE;

				SOF_TIMESTAMPING_RAW_HARDWARE |

				SOF_TIMESTAMPING_TX_SOFTWARE |

				SOF_TIMESTAMPING_RX_SOFTWARE |

				SOF_TIMESTAMPING_SOFTWARE;



	info->tx_types = (1 << HWTSTAMP_TX_OFF) |

			 (1 << HWTSTAMP_TX_ON) |