Commit 6395ad85 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from David Miller:

 1) The real fix for the ipv6 route metric leak Sabrina was seeing, from
    Cong Wang.

 2) Fix syzbot triggers AF_PACKET v3 ring buffer insufficient room
    conditions, from Willem de Bruijn.

 3) vsock can reinitialize active work struct, fix from Cong Wang.

 4) RXRPC keepalive generator can wedge a cpu, fix from David Howells.

 5) Fix locking in AF_SMC ioctl, from Ursula Braun.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  dsa: slave: eee: Allow ports to use phylink
  net/smc: move sock lock in smc_ioctl()
  net/smc: allow sysctl rmem and wmem defaults for servers
  net/smc: no shutdown in state SMC_LISTEN
  net: aquantia: Fix IFF_ALLMULTI flag functionality
  rxrpc: Fix the keepalive generator [ver #2]
  net/mlx5e: Cleanup of dcbnl related fields
  net/mlx5e: Properly check if hairpin is possible between two functions
  vhost: reset metadata cache when initializing new IOTLB
  llc: use refcount_inc_not_zero() for llc_sap_find()
  dccp: fix undefined behavior with 'cwnd' shift in ccid2_cwnd_restart()
  tipc: fix an interrupt unsafe locking scenario
  vsock: split dwork to avoid reinitializations
  net: thunderx: check for failed allocation lmac->dmacs
  cxgb4: mk_act_open_req() buggers ->{local, peer}_ip on big-endian hosts
  packet: refine ring v3 block size test to hold one frame
  ip6_tunnel: use the right value for ipv4 min mtu check in ip6_tnl_xmit
  ipv6: fix double refcount of fib6_metrics
parents fedb8da9 1be52e97

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c

+1 −1
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ static int hw_atl_b0_hw_packet_filter_set(struct aq_hw_s *self, 


	hw_atl_rpfl2promiscuous_mode_en_set(self, IS_FILTER_ENABLED(IFF_PROMISC));

	hw_atl_rpfl2multicast_flr_en_set(self,

					 IS_FILTER_ENABLED(IFF_MULTICAST), 0);

					 IS_FILTER_ENABLED(IFF_ALLMULTI), 0);



	hw_atl_rpfl2_accept_all_mc_packets_set(self,

					       IS_FILTER_ENABLED(IFF_ALLMULTI));

drivers/net/ethernet/cavium/thunder/thunder_bgx.c

+2 −0
Original line number Diff line number Diff line
@@ -1083,6 +1083,8 @@ static int bgx_lmac_enable(struct bgx *bgx, u8 lmacid) 
	lmac->dmacs_count = (RX_DMAC_COUNT / bgx->lmac_count);

	lmac->dmacs = kcalloc(lmac->dmacs_count, sizeof(*lmac->dmacs),

			      GFP_KERNEL);

	if (!lmac->dmacs)

		return -ENOMEM;



	/* Enable lmac */

	bgx_reg_modify(bgx, lmacid, BGX_CMRX_CFG, CMR_EN);

drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c

+2 −4
Original line number Diff line number Diff line
@@ -1038,10 +1038,8 @@ static void mk_act_open_req(struct filter_entry *f, struct sk_buff *skb, 
	OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_ACT_OPEN_REQ, qid_filterid));

	req->local_port = cpu_to_be16(f->fs.val.lport);

	req->peer_port = cpu_to_be16(f->fs.val.fport);

	req->local_ip = f->fs.val.lip[0] | f->fs.val.lip[1] << 8 |

		f->fs.val.lip[2] << 16 | f->fs.val.lip[3] << 24;

	req->peer_ip = f->fs.val.fip[0] | f->fs.val.fip[1] << 8 |

		f->fs.val.fip[2] << 16 | f->fs.val.fip[3] << 24;

	memcpy(&req->local_ip, f->fs.val.lip, 4);

	memcpy(&req->peer_ip, f->fs.val.fip, 4);

	req->opt0 = cpu_to_be64(NAGLE_V(f->fs.newvlan == VLAN_REMOVE ||

					f->fs.newvlan == VLAN_REWRITE) |

				DELACK_V(f->fs.hitcnts) |

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

+0 −2
Original line number Diff line number Diff line
@@ -858,8 +858,6 @@ struct mlx5e_profile { 
		mlx5e_fp_handle_rx_cqe handle_rx_cqe;

		mlx5e_fp_handle_rx_cqe handle_rx_cqe_mpwqe;

	} rx_handlers;

	void	(*netdev_registered_init)(struct mlx5e_priv *priv);

	void    (*netdev_registered_remove)(struct mlx5e_priv *priv);

	int	max_tc;

};

drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c

+11 −19
Original line number Diff line number Diff line
@@ -443,16 +443,12 @@ static int mlx5e_dcbnl_ieee_setapp(struct net_device *dev, struct dcb_app *app) 
	bool is_new;

	int err;



	if (app->selector != IEEE_8021QAZ_APP_SEL_DSCP)

		return -EINVAL;



	if (!MLX5_CAP_GEN(priv->mdev, vport_group_manager))

		return -EINVAL;



	if (!MLX5_DSCP_SUPPORTED(priv->mdev))

		return -EINVAL;

	if (!MLX5_CAP_GEN(priv->mdev, vport_group_manager) ||

	    !MLX5_DSCP_SUPPORTED(priv->mdev))

		return -EOPNOTSUPP;



	if (app->protocol >= MLX5E_MAX_DSCP)

	if ((app->selector != IEEE_8021QAZ_APP_SEL_DSCP) ||

	    (app->protocol >= MLX5E_MAX_DSCP))

		return -EINVAL;



	/* Save the old entry info */
@@ -500,16 +496,12 @@ static int mlx5e_dcbnl_ieee_delapp(struct net_device *dev, struct dcb_app *app) 
	struct mlx5e_priv *priv = netdev_priv(dev);

	int err;



	if (app->selector != IEEE_8021QAZ_APP_SEL_DSCP)

		return -EINVAL;



	if (!MLX5_CAP_GEN(priv->mdev, vport_group_manager))

		return -EINVAL;



	if (!MLX5_DSCP_SUPPORTED(priv->mdev))

		return -EINVAL;

	if  (!MLX5_CAP_GEN(priv->mdev, vport_group_manager) ||

	     !MLX5_DSCP_SUPPORTED(priv->mdev))

		return -EOPNOTSUPP;



	if (app->protocol >= MLX5E_MAX_DSCP)

	if ((app->selector != IEEE_8021QAZ_APP_SEL_DSCP) ||

	    (app->protocol >= MLX5E_MAX_DSCP))

		return -EINVAL;



	/* Skip if no dscp app entry */

CRA Git | Maintained and supported by SUSTech CRA and CCSE