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

Commit 037222ad 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) Count ttl-dropped frames properly in mac80211, from Bob Copeland.

 2) Integer overflow in ktime handling of bcm can code, from Oliver
    Hartkopp.

 3) Fix RX desc handling wrt. hw checksumming in ravb, from Simon
    Horman.

 4) Various hash key fixes in hv_netvsc, from Haiyang Zhang.

 5) Use after free in ax25, from Eric Dumazet.

 6) Several fixes to the SSN support in SCTP, from Xin Long.

 7) Do not process frames after a NAPI reschedule in ibmveth, from
    Thomas Falcon.

 8) Fix NLA_POLICY_NESTED arguments, from Johannes Berg.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (42 commits)
  qed: Revert error handling changes.
  cfg80211: extend range deviation for DMG
  cfg80211: reg: remove warn_on for a normal case
  mac80211: Add attribute aligned(2) to struct 'action'
  mac80211: don't initiate TDLS connection if station is not associated to AP
  nl80211: fix NLA_POLICY_NESTED() arguments
  ibmveth: Do not process frames after calling napi_reschedule
  net: dev_is_mac_header_xmit() true for ARPHRD_RAWIP
  net: usb: asix: ax88772_bind return error when hw_reset fail
  MAINTAINERS: Update cavium networking drivers
  net/mlx4_core: Fix error handling when initializing CQ bufs in the driver
  net/mlx4_core: Add masking for a few queries on HCA caps
  sctp: set flow sport from saddr only when it's 0
  sctp: set chunk transport correctly when it's a new asoc
  sctp: improve the events for sctp stream adding
  sctp: improve the events for sctp stream reset
  ip_tunnel: Make none-tunnel-dst tunnel port work with lwtunnel
  ax25: fix possible use-after-free
  sfc: suppress duplicate nvmem partition types in efx_ef10_mtd_probe
  hv_netvsc: fix typos in code comments
  ...
parents 7c2614bf abfd04f7

MAINTAINERS

+21 −21
Original line number Diff line number Diff line
@@ -3052,8 +3052,8 @@ F: include/linux/bcm963xx_nvram.h 
F:	include/linux/bcm963xx_tag.h



BROADCOM BNX2 GIGABIT ETHERNET DRIVER

M:	Rasesh Mody <rasesh.mody@cavium.com>

M:	Dept-GELinuxNICDev@cavium.com

M:	Rasesh Mody <rmody@marvell.com>

M:	GR-Linux-NIC-Dev@marvell.com

L:	netdev@vger.kernel.org

S:	Supported

F:	drivers/net/ethernet/broadcom/bnx2.*
@@ -3072,9 +3072,9 @@ S: Supported 
F:	drivers/scsi/bnx2i/



BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER

M:	Ariel Elior <ariel.elior@cavium.com>

M:	Sudarsana Kalluru <sudarsana.kalluru@cavium.com>

M:	everest-linux-l2@cavium.com

M:	Ariel Elior <aelior@marvell.com>

M:	Sudarsana Kalluru <skalluru@marvell.com>

M:	GR-everest-linux-l2@marvell.com

L:	netdev@vger.kernel.org

S:	Supported

F:	drivers/net/ethernet/broadcom/bnx2x/
@@ -3249,9 +3249,9 @@ S: Supported 
F:	drivers/scsi/bfa/



BROCADE BNA 10 GIGABIT ETHERNET DRIVER

M:	Rasesh Mody <rasesh.mody@cavium.com>

M:	Sudarsana Kalluru <sudarsana.kalluru@cavium.com>

M:	Dept-GELinuxNICDev@cavium.com

M:	Rasesh Mody <rmody@marvell.com>

M:	Sudarsana Kalluru <skalluru@marvell.com>

M:	GR-Linux-NIC-Dev@marvell.com

L:	netdev@vger.kernel.org

S:	Supported

F:	drivers/net/ethernet/brocade/bna/
@@ -10690,9 +10690,9 @@ S: Maintained 
F:	drivers/net/netdevsim/*



NETXEN (1/10) GbE SUPPORT

M:	Manish Chopra <manish.chopra@cavium.com>

M:	Rahul Verma <rahul.verma@cavium.com>

M:	Dept-GELinuxNICDev@cavium.com

M:	Manish Chopra <manishc@marvell.com>

M:	Rahul Verma <rahulv@marvell.com>

M:	GR-Linux-NIC-Dev@marvell.com

L:	netdev@vger.kernel.org

S:	Supported

F:	drivers/net/ethernet/qlogic/netxen/
@@ -12476,8 +12476,8 @@ S: Supported 
F:	drivers/scsi/qedi/



QLOGIC QL4xxx ETHERNET DRIVER

M:	Ariel Elior <Ariel.Elior@cavium.com>

M:	everest-linux-l2@cavium.com

M:	Ariel Elior <aelior@marvell.com>

M:	GR-everest-linux-l2@marvell.com

L:	netdev@vger.kernel.org

S:	Supported

F:	drivers/net/ethernet/qlogic/qed/
@@ -12485,8 +12485,8 @@ F: include/linux/qed/ 
F:	drivers/net/ethernet/qlogic/qede/



QLOGIC QL4xxx RDMA DRIVER

M:	Michal Kalderon <Michal.Kalderon@cavium.com>

M:	Ariel Elior <Ariel.Elior@cavium.com>

M:	Michal Kalderon <mkalderon@marvell.com>

M:	Ariel Elior <aelior@marvell.com>

L:	linux-rdma@vger.kernel.org

S:	Supported

F:	drivers/infiniband/hw/qedr/
@@ -12506,7 +12506,7 @@ F: Documentation/scsi/LICENSE.qla2xxx 
F:	drivers/scsi/qla2xxx/



QLOGIC QLA3XXX NETWORK DRIVER

M:	Dept-GELinuxNICDev@cavium.com

M:	GR-Linux-NIC-Dev@marvell.com

L:	netdev@vger.kernel.org

S:	Supported

F:	Documentation/networking/device_drivers/qlogic/LICENSE.qla3xxx
@@ -12520,16 +12520,16 @@ F: Documentation/scsi/LICENSE.qla4xxx 
F:	drivers/scsi/qla4xxx/



QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER

M:	Shahed Shaikh <Shahed.Shaikh@cavium.com>

M:	Manish Chopra <manish.chopra@cavium.com>

M:	Dept-GELinuxNICDev@cavium.com

M:	Shahed Shaikh <shshaikh@marvell.com>

M:	Manish Chopra <manishc@marvell.com>

M:	GR-Linux-NIC-Dev@marvell.com

L:	netdev@vger.kernel.org

S:	Supported

F:	drivers/net/ethernet/qlogic/qlcnic/



QLOGIC QLGE 10Gb ETHERNET DRIVER

M:	Manish Chopra <manish.chopra@cavium.com>

M:	Dept-GELinuxNICDev@cavium.com

M:	Manish Chopra <manishc@marvell.com>

M:	GR-Linux-NIC-Dev@marvell.com

L:	netdev@vger.kernel.org

S:	Supported

F:	drivers/net/ethernet/qlogic/qlge/

drivers/net/can/dev.c

+13 −14
Original line number Diff line number Diff line
@@ -480,8 +480,6 @@ EXPORT_SYMBOL_GPL(can_put_echo_skb); 
struct sk_buff *__can_get_echo_skb(struct net_device *dev, unsigned int idx, u8 *len_ptr)

{

	struct can_priv *priv = netdev_priv(dev);

	struct sk_buff *skb = priv->echo_skb[idx];

	struct canfd_frame *cf;



	if (idx >= priv->echo_skb_max) {

		netdev_err(dev, "%s: BUG! Trying to access can_priv::echo_skb out of bounds (%u/max %u)\n",
@@ -489,22 +487,23 @@ struct sk_buff *__can_get_echo_skb(struct net_device *dev, unsigned int idx, u8 
		return NULL;

	}



	if (!skb) {

		netdev_err(dev, "%s: BUG! Trying to echo non existing skb: can_priv::echo_skb[%u]\n",

			   __func__, idx);

		return NULL;

	}



	if (priv->echo_skb[idx]) {

		/* Using "struct canfd_frame::len" for the frame

		 * length is supported on both CAN and CANFD frames.

		 */

	cf = (struct canfd_frame *)skb->data;

	*len_ptr = cf->len;

		struct sk_buff *skb = priv->echo_skb[idx];

		struct canfd_frame *cf = (struct canfd_frame *)skb->data;

		u8 len = cf->len;



		*len_ptr = len;

		priv->echo_skb[idx] = NULL;



		return skb;

	}



	return NULL;

}



/*

 * Get the skb from the stack and loop it back locally

 *

drivers/net/can/flexcan.c

+2 −2
Original line number Diff line number Diff line
@@ -1106,7 +1106,7 @@ static int flexcan_chip_start(struct net_device *dev) 
		}

	} else {

		/* clear and invalidate unused mailboxes first */

		for (i = FLEXCAN_TX_MB_RESERVED_OFF_FIFO; i <= priv->mb_count; i++) {

		for (i = FLEXCAN_TX_MB_RESERVED_OFF_FIFO; i < priv->mb_count; i++) {

			mb = flexcan_get_mb(priv, i);

			priv->write(FLEXCAN_MB_CODE_RX_INACTIVE,

				    &mb->can_ctrl);
@@ -1432,7 +1432,7 @@ static int flexcan_setup_stop_mode(struct platform_device *pdev) 
	gpr_np = of_find_node_by_phandle(phandle);

	if (!gpr_np) {

		dev_dbg(&pdev->dev, "could not find gpr node by phandle\n");

		return PTR_ERR(gpr_np);

		return -ENODEV;

	}



	priv = netdev_priv(dev);

drivers/net/ethernet/altera/altera_tse_main.c

+3 −1
Original line number Diff line number Diff line
@@ -714,8 +714,10 @@ static struct phy_device *connect_local_phy(struct net_device *dev) 


		phydev = phy_connect(dev, phy_id_fmt, &altera_tse_adjust_link,

				     priv->phy_iface);

		if (IS_ERR(phydev))

		if (IS_ERR(phydev)) {

			netdev_err(dev, "Could not attach to PHY\n");

			phydev = NULL;

		}



	} else {

		int ret;

drivers/net/ethernet/freescale/dpaa2/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -9,8 +9,9 @@ config FSL_DPAA2_ETH 


config FSL_DPAA2_PTP_CLOCK

	tristate "Freescale DPAA2 PTP Clock"

	depends on FSL_DPAA2_ETH && POSIX_TIMERS

	select PTP_1588_CLOCK

	depends on FSL_DPAA2_ETH

	imply PTP_1588_CLOCK

	default y

	help

	  This driver adds support for using the DPAA2 1588 timer module

	  as a PTP clock.