Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1d84a1b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

Dave writes:
  "Networking fixes:

  1) Fix truncation of 32-bit right shift in bpf, from Jann Horn.

  2) Fix memory leak in wireless wext compat, from Stefan Seyfried.

  3) Use after free in cfg80211's reg_process_hint(), from Yu Zhao.

  4) Need to cancel pending work when unbinding in smsc75xx otherwise
     we oops, also from Yu Zhao.

  5) Don't allow enslaving a team device to itself, from Ido Schimmel.

  6) Fix backwards compat with older userspace for rtnetlink FDB dumps.
     From Mauricio Faria.

  7) Add validation of tc policy netlink attributes, from David Ahern.

  8) Fix RCU locking in rawv6_send_hdrinc(), from Wei Wang."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits)
  net: mvpp2: Extract the correct ethtype from the skb for tx csum offload
  ipv6: take rcu lock in rawv6_send_hdrinc()
  net: sched: Add policy validation for tc attributes
  rtnetlink: fix rtnl_fdb_dump() for ndmsg header
  yam: fix a missing-check bug
  net: bpfilter: Fix type cast and pointer warnings
  net: cxgb3_main: fix a missing-check bug
  bpf: 32-bit RSH verification must truncate input before the ALU op
  net: phy: phylink: fix SFP interface autodetection
  be2net: don't flip hw_features when VXLANs are added/deleted
  net/packet: fix packet drop as of virtio gso
  net: dsa: b53: Keep CPU port as tagged in all VLANs
  openvswitch: load NAT helper
  bnxt_en: get the reduced max_irqs by the ones used by RDMA
  bnxt_en: free hwrm resources, if driver probe fails.
  bnxt_en: Fix enables field in HWRM_QUEUE_COS2BW_CFG request
  bnxt_en: Fix VNIC reservations on the PF.
  team: Forbid enslaving team device to itself
  net/usb: cancel pending work when unbinding smsc75xx
  mlxsw: spectrum: Delete RIF when VLAN device is removed
  ...
parents 091a1eaa 35f3625c

drivers/net/dsa/b53/b53_common.c

+2 −2
Original line number Diff line number Diff line
@@ -1107,7 +1107,7 @@ void b53_vlan_add(struct dsa_switch *ds, int port, 
		b53_get_vlan_entry(dev, vid, vl);



		vl->members |= BIT(port);

		if (untagged)

		if (untagged && !dsa_is_cpu_port(ds, port))

			vl->untag |= BIT(port);

		else

			vl->untag &= ~BIT(port);
@@ -1149,7 +1149,7 @@ int b53_vlan_del(struct dsa_switch *ds, int port, 
				pvid = 0;

		}



		if (untagged)

		if (untagged && !dsa_is_cpu_port(ds, port))

			vl->untag &= ~(BIT(port));



		b53_set_vlan_entry(dev, vid, vl);

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

+8 −6
Original line number Diff line number Diff line
@@ -3017,11 +3017,12 @@ static void bnxt_free_hwrm_resources(struct bnxt *bp) 
{

	struct pci_dev *pdev = bp->pdev;



	if (bp->hwrm_cmd_resp_addr) {

		dma_free_coherent(&pdev->dev, PAGE_SIZE, bp->hwrm_cmd_resp_addr,

				  bp->hwrm_cmd_resp_dma_addr);



		bp->hwrm_cmd_resp_addr = NULL;

	}

}



static int bnxt_alloc_hwrm_resources(struct bnxt *bp)

{
@@ -4650,7 +4651,7 @@ __bnxt_hwrm_reserve_pf_rings(struct bnxt *bp, struct hwrm_func_cfg_input *req, 
				      FUNC_CFG_REQ_ENABLES_NUM_STAT_CTXS : 0;

		enables |= ring_grps ?

			   FUNC_CFG_REQ_ENABLES_NUM_HW_RING_GRPS : 0;

		enables |= vnics ? FUNC_VF_CFG_REQ_ENABLES_NUM_VNICS : 0;

		enables |= vnics ? FUNC_CFG_REQ_ENABLES_NUM_VNICS : 0;



		req->num_rx_rings = cpu_to_le16(rx_rings);

		req->num_hw_ring_grps = cpu_to_le16(ring_grps);
@@ -8621,7 +8622,7 @@ static void _bnxt_get_max_rings(struct bnxt *bp, int *max_rx, int *max_tx, 
	*max_tx = hw_resc->max_tx_rings;

	*max_rx = hw_resc->max_rx_rings;

	*max_cp = min_t(int, bnxt_get_max_func_cp_rings_for_en(bp),

			hw_resc->max_irqs);

			hw_resc->max_irqs - bnxt_get_ulp_msix_num(bp));

	*max_cp = min_t(int, *max_cp, hw_resc->max_stat_ctxs);

	max_ring_grps = hw_resc->max_hw_ring_grps;

	if (BNXT_CHIP_TYPE_NITRO_A0(bp) && BNXT_PF(bp)) {
@@ -9057,6 +9058,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	bnxt_clear_int_mode(bp);



init_err_pci_clean:

	bnxt_free_hwrm_resources(bp);

	bnxt_cleanup_pci(bp);



init_err_free:

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

+3 −3
Original line number Diff line number Diff line
@@ -98,13 +98,13 @@ static int bnxt_hwrm_queue_cos2bw_cfg(struct bnxt *bp, struct ieee_ets *ets, 


	bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_QUEUE_COS2BW_CFG, -1, -1);

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

		u8 qidx;

		u8 qidx = bp->tc_to_qidx[i];



		req.enables |= cpu_to_le32(

			QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID0_VALID << i);

			QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID0_VALID <<

			qidx);



		memset(&cos2bw, 0, sizeof(cos2bw));

		qidx = bp->tc_to_qidx[i];

		cos2bw.queue_id = bp->q_info[qidx].queue_id;

		if (ets->tc_tsa[i] == IEEE_8021QAZ_TSA_STRICT) {

			cos2bw.tsa =

drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c

+17 −0
Original line number Diff line number Diff line
@@ -2159,6 +2159,8 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr) 
			return -EPERM;

		if (copy_from_user(&t, useraddr, sizeof(t)))

			return -EFAULT;

		if (t.cmd != CHELSIO_SET_QSET_PARAMS)

			return -EINVAL;

		if (t.qset_idx >= SGE_QSETS)

			return -EINVAL;

		if (!in_range(t.intr_lat, 0, M_NEWTIMER) ||
@@ -2258,6 +2260,9 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr) 
		if (copy_from_user(&t, useraddr, sizeof(t)))

			return -EFAULT;



		if (t.cmd != CHELSIO_GET_QSET_PARAMS)

			return -EINVAL;



		/* Display qsets for all ports when offload enabled */

		if (test_bit(OFFLOAD_DEVMAP_BIT, &adapter->open_device_map)) {

			q1 = 0;
@@ -2303,6 +2308,8 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr) 
			return -EBUSY;

		if (copy_from_user(&edata, useraddr, sizeof(edata)))

			return -EFAULT;

		if (edata.cmd != CHELSIO_SET_QSET_NUM)

			return -EINVAL;

		if (edata.val < 1 ||

			(edata.val > 1 && !(adapter->flags & USING_MSIX)))

			return -EINVAL;
@@ -2343,6 +2350,8 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr) 
			return -EPERM;

		if (copy_from_user(&t, useraddr, sizeof(t)))

			return -EFAULT;

		if (t.cmd != CHELSIO_LOAD_FW)

			return -EINVAL;

		/* Check t.len sanity ? */

		fw_data = memdup_user(useraddr + sizeof(t), t.len);

		if (IS_ERR(fw_data))
@@ -2366,6 +2375,8 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr) 
			return -EBUSY;

		if (copy_from_user(&m, useraddr, sizeof(m)))

			return -EFAULT;

		if (m.cmd != CHELSIO_SETMTUTAB)

			return -EINVAL;

		if (m.nmtus != NMTUS)

			return -EINVAL;

		if (m.mtus[0] < 81)	/* accommodate SACK */
@@ -2407,6 +2418,8 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr) 
			return -EBUSY;

		if (copy_from_user(&m, useraddr, sizeof(m)))

			return -EFAULT;

		if (m.cmd != CHELSIO_SET_PM)

			return -EINVAL;

		if (!is_power_of_2(m.rx_pg_sz) ||

			!is_power_of_2(m.tx_pg_sz))

			return -EINVAL;	/* not power of 2 */
@@ -2440,6 +2453,8 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr) 
			return -EIO;	/* need the memory controllers */

		if (copy_from_user(&t, useraddr, sizeof(t)))

			return -EFAULT;

		if (t.cmd != CHELSIO_GET_MEM)

			return -EINVAL;

		if ((t.addr & 7) || (t.len & 7))

			return -EINVAL;

		if (t.mem_id == MEM_CM)
@@ -2492,6 +2507,8 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr) 
			return -EAGAIN;

		if (copy_from_user(&t, useraddr, sizeof(t)))

			return -EFAULT;

		if (t.cmd != CHELSIO_SET_TRACE_FILTER)

			return -EINVAL;



		tp = (const struct trace_params *)&t.sip;

		if (t.config_tx)

drivers/net/ethernet/emulex/benet/be_main.c

+1 −4
Original line number Diff line number Diff line
@@ -4002,8 +4002,6 @@ static int be_enable_vxlan_offloads(struct be_adapter *adapter) 
	netdev->hw_enc_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |

				   NETIF_F_TSO | NETIF_F_TSO6 |

				   NETIF_F_GSO_UDP_TUNNEL;

	netdev->hw_features |= NETIF_F_GSO_UDP_TUNNEL;

	netdev->features |= NETIF_F_GSO_UDP_TUNNEL;



	dev_info(dev, "Enabled VxLAN offloads for UDP port %d\n",

		 be16_to_cpu(port));
@@ -4025,8 +4023,6 @@ static void be_disable_vxlan_offloads(struct be_adapter *adapter) 
	adapter->vxlan_port = 0;



	netdev->hw_enc_features = 0;

	netdev->hw_features &= ~(NETIF_F_GSO_UDP_TUNNEL);

	netdev->features &= ~(NETIF_F_GSO_UDP_TUNNEL);

}



static void be_calculate_vf_res(struct be_adapter *adapter, u16 num_vfs,
@@ -5320,6 +5316,7 @@ static void be_netdev_init(struct net_device *netdev) 
	struct be_adapter *adapter = netdev_priv(netdev);



	netdev->hw_features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 |

		NETIF_F_GSO_UDP_TUNNEL |

		NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM |

		NETIF_F_HW_VLAN_CTAG_TX;

	if ((be_if_cap_flags(adapter) & BE_IF_FLAGS_RSS))