Commit 738d2902 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from David Miller:

 1) Fix big endian overflow in nf_flow_table, from Arnd Bergmann.

 2) Fix port selection on big endian in nft_tproxy, from Phil Sutter.

 3) Fix precision tracking for unbound scalars in bpf verifier, from
    Daniel Borkmann.

 4) Fix integer overflow in socket rcvbuf check in UDP, from Antonio
    Messina.

 5) Do not perform a neigh confirmation during a pmtu update over a
    tunnel, from Hangbin Liu.

 6) Fix DMA mapping leak in dpaa_eth driver, from Madalin Bucur.

 7) Various PTP fixes for sja1105 dsa driver, from Vladimir Oltean.

 8) Add missing to dummy definition of of_mdiobus_child_is_phy(), from
    Geert Uytterhoeven

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (54 commits)
  hsr: fix slab-out-of-bounds Read in hsr_debugfs_rename()
  net/sched: add delete_empty() to filters and use it in cls_flower
  tcp: Fix highest_sack and highest_sack_seq
  ptp: fix the race between the release of ptp_clock and cdev
  net: dsa: sja1105: Reconcile the meaning of TPID and TPID2 for E/T and P/Q/R/S
  Documentation: net: dsa: sja1105: Remove text about taprio base-time limitation
  net: dsa: sja1105: Remove restriction of zero base-time for taprio offload
  net: dsa: sja1105: Really make the PTP command read-write
  net: dsa: sja1105: Take PTP egress timestamp by port, not mgmt slot
  cxgb4/cxgb4vf: fix flow control display for auto negotiation
  mlxsw: spectrum: Use dedicated policer for VRRP packets
  mlxsw: spectrum_router: Skip loopback RIFs during MAC validation
  net: stmmac: dwmac-meson8b: Fix the RGMII TX delay on Meson8b/8m2 SoCs
  net/sched: act_mirred: Pull mac prior redir to non mac_header_xmit device
  net_sched: sch_fq: properly set sk->sk_pacing_status
  bnx2x: Fix accounting of vlan resources among the PFs
  bnx2x: Use appropriate define for vlan credit
  of: mdio: Add missing inline to of_mdiobus_child_is_phy() dummy
  net: phy: aquantia: add suspend / resume ops for AQR105
  dpaa_eth: fix DMA mapping leak
  ...
parents c5c928c6 04b69426

Documentation/networking/dsa/sja1105.rst

+0 −6
Original line number Diff line number Diff line
@@ -230,12 +230,6 @@ simultaneously on two ports. The driver checks the consistency of the schedules 
against this restriction and errors out when appropriate. Schedule analysis is

needed to avoid this, which is outside the scope of the document.



At the moment, the time-aware scheduler can only be triggered based on a

standalone clock and not based on PTP time. This means the base-time argument

from tc-taprio is ignored and the schedule starts right away. It also means it

is more difficult to phase-align the scheduler with the other devices in the

network.



Device Tree bindings and board design

=====================================

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -771,6 +771,8 @@ F: drivers/thermal/thermal_mmio.c 














AMAZON ETHERNET DRIVERS















M:	Netanel Belgazal <netanel@amazon.com>













M:	Arthur Kiyanovski <akiyano@amazon.com>













R:	Guy Tzalik <gtzalik@amazon.com>















R:	Saeed Bishara <saeedb@amazon.com>















R:	Zorik Machulsky <zorik@amazon.com>















L:	netdev@vger.kernel.org

































drivers/net/dsa/bcm_sf2_cfp.c



+3
−3






























Original line number
Diff line number
Diff line








@@ -358,7 +358,7 @@ static int bcm_sf2_cfp_ipv4_rule_set(struct bcm_sf2_priv *priv, int port,













		return -EINVAL;















	}





























	ip_frag = be32_to_cpu(fs->m_ext.data[0]);













	ip_frag = !!(be32_to_cpu(fs->h_ext.data[0]) & 1);































	/* Locate the first rule available */















	if (fs->location == RX_CLS_LOC_ANY)










@@ -569,7 +569,7 @@ static int bcm_sf2_cfp_rule_cmp(struct bcm_sf2_priv *priv, int port,





























		if (rule->fs.flow_type != fs->flow_type ||















		    rule->fs.ring_cookie != fs->ring_cookie ||













		    rule->fs.m_ext.data[0] != fs->m_ext.data[0])













		    rule->fs.h_ext.data[0] != fs->h_ext.data[0])















			continue;































		switch (fs->flow_type & ~FLOW_EXT) {










@@ -621,7 +621,7 @@ static int bcm_sf2_cfp_ipv6_rule_set(struct bcm_sf2_priv *priv, int port,













		return -EINVAL;















	}





























	ip_frag = be32_to_cpu(fs->m_ext.data[0]);













	ip_frag = !!(be32_to_cpu(fs->h_ext.data[0]) & 1);































	layout = &udf_tcpip6_layout;















	slice_num = bcm_sf2_get_slice_number(layout, 0);

































drivers/net/dsa/sja1105/sja1105_main.c



+5
−5






























Original line number
Diff line number
Diff line








@@ -1569,8 +1569,8 @@ static int sja1105_vlan_filtering(struct dsa_switch *ds, int port, bool enabled)





























	if (enabled) {















		/* Enable VLAN filtering. */













		tpid  = ETH_P_8021AD;













		tpid2 = ETH_P_8021Q;













		tpid  = ETH_P_8021Q;













		tpid2 = ETH_P_8021AD;















	} else {















		/* Disable VLAN filtering. */















		tpid  = ETH_P_SJA1105;









@@ -1579,9 +1579,9 @@ static int sja1105_vlan_filtering(struct dsa_switch *ds, int port, bool enabled)





























	table = &priv->static_config.tables[BLK_IDX_GENERAL_PARAMS];















	general_params = table->entries;













	/* EtherType used to identify outer tagged (S-tag) VLAN traffic */













	general_params->tpid = tpid;















	/* EtherType used to identify inner tagged (C-tag) VLAN traffic */













	general_params->tpid = tpid;













	/* EtherType used to identify outer tagged (S-tag) VLAN traffic */















	general_params->tpid2 = tpid2;















	/* When VLAN filtering is on, we need to at least be able to















	 * decode management traffic through the "backup plan".










@@ -1855,7 +1855,7 @@ static netdev_tx_t sja1105_port_deferred_xmit(struct dsa_switch *ds, int port,













	if (!clone)















		goto out;





























	sja1105_ptp_txtstamp_skb(ds, slot, clone);













	sja1105_ptp_txtstamp_skb(ds, port, clone);































out:















	mutex_unlock(&priv->mgmt_lock);

































drivers/net/dsa/sja1105/sja1105_ptp.c



+3
−3






























Original line number
Diff line number
Diff line








@@ -234,7 +234,7 @@ int sja1105_ptp_commit(struct dsa_switch *ds, struct sja1105_ptp_cmd *cmd,













	if (rw == SPI_WRITE)















		priv->info->ptp_cmd_packing(buf, cmd, PACK);





























	rc = sja1105_xfer_buf(priv, SPI_WRITE, regs->ptp_control, buf,













	rc = sja1105_xfer_buf(priv, rw, regs->ptp_control, buf,















			      SJA1105_SIZE_PTP_CMD);































	if (rw == SPI_READ)










@@ -659,7 +659,7 @@ void sja1105_ptp_clock_unregister(struct dsa_switch *ds)













	ptp_data->clock = NULL;















}





























void sja1105_ptp_txtstamp_skb(struct dsa_switch *ds, int slot,













void sja1105_ptp_txtstamp_skb(struct dsa_switch *ds, int port,















			      struct sk_buff *skb)















{















	struct sja1105_private *priv = ds->priv;









@@ -679,7 +679,7 @@ void sja1105_ptp_txtstamp_skb(struct dsa_switch *ds, int slot,













		goto out;















	}





























	rc = sja1105_ptpegr_ts_poll(ds, slot, &ts);













	rc = sja1105_ptpegr_ts_poll(ds, port, &ts);















	if (rc < 0) {















		dev_err(ds->dev, "timed out polling for tstamp\n");















		kfree_skb(skb);









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE