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

Commit 3deaa4f5 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) Fix regression in SKB partial checksum handling, from Pravin B
   Shalar.

2) Fix VLAN inside of VXLAN handling in i40e driver, from Jesse
   Brandeburg.

3) Cure softlockups during accept() in SCTP, from Karl Heiss.

4) MSG_PEEK should return multiple SKBs worth of data in AF_UNIX, from
   Aaron Conole.

5) IPV6 erroneously ignores output interface specifier in lookup key for
   route lookups, fix from David Ahern.

6) In Marvell DSA driver, forward unknown frames to CPU port, from
   Andrew Lunn.

7) Mission flow flag initializations in some code paths, from David
   Ahern.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  net: Initialize flow flags in input path
  net: dsa: fix preparation of a port STP update
  testptp: Silence compiler warnings on ppc64
  net/mlx4: Handle return codes in mlx4_qp_attach_common
  dsa: mv88e6xxx: Enable forwarding for unknown to the CPU port
  skbuff: Fix skb checksum partial check.
  net: ipv6: Add RT6_LOOKUP_F_IFACE flag if oif is set
  net sysfs: Print link speed as signed integer
  bna: fix error handling
  af_unix: return data from multiple SKBs on recv() with MSG_PEEK flag
  af_unix: Convert the unix_sk macro to an inline function for type safety
  net: sctp: Don't use 64 kilobyte lookup table for four elements
  l2tp: protect tunnel->del_work by ref_count
  net/ibm/emac: bump version numbers for correct work with ethtool
  sctp: Prevent soft lockup when sctp_accept() is called during a timeout event
  sctp: Whitespace fix
  i40e/i40evf: check for stopped admin queue
  i40e: fix VLAN inside VXLAN
  r8169: fix handling rtl_readphy result
  net: hisilicon: fix handling platform_get_irq result
parents ccf70ddc b84f7878

Documentation/ptp/testptp.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 */

 */

#define _GNU_SOURCE

#define _GNU_SOURCE

#define __SANE_USERSPACE_TYPES__        /* For PPC64, to get LL64 types */

#include <errno.h>

#include <errno.h>

#include <fcntl.h>

#include <fcntl.h>

#include <inttypes.h>

#include <inttypes.h>

drivers/net/dsa/mv88e6xxx.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -2051,6 +2051,8 @@ static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port) 
				reg |= PORT_CONTROL_FRAME_ETHER_TYPE_DSA;

				reg |= PORT_CONTROL_FRAME_ETHER_TYPE_DSA;

			else

			else

				reg |= PORT_CONTROL_FRAME_MODE_DSA;

				reg |= PORT_CONTROL_FRAME_MODE_DSA;

			reg |= PORT_CONTROL_FORWARD_UNKNOWN |

				PORT_CONTROL_FORWARD_UNKNOWN_MC;

		}

		}





		if (mv88e6xxx_6352_family(ds) || mv88e6xxx_6351_family(ds) ||

		if (mv88e6xxx_6352_family(ds) || mv88e6xxx_6351_family(ds) ||

drivers/net/ethernet/brocade/bna/bfa_ioc.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -1543,7 +1543,7 @@ bfa_flash_cmd_act_check(void __iomem *pci_bar) 
}

}





/* Flush FLI data fifo. */

/* Flush FLI data fifo. */

static u32

static int

bfa_flash_fifo_flush(void __iomem *pci_bar)

bfa_flash_fifo_flush(void __iomem *pci_bar)

{

{

	u32 i;

	u32 i;
@@ -1573,11 +1573,11 @@ bfa_flash_fifo_flush(void __iomem *pci_bar) 
}

}





/* Read flash status. */

/* Read flash status. */

static u32

static int

bfa_flash_status_read(void __iomem *pci_bar)

bfa_flash_status_read(void __iomem *pci_bar)

{

{

	union bfa_flash_dev_status_reg	dev_status;

	union bfa_flash_dev_status_reg	dev_status;

	u32				status;

	int				status;

	u32			ret_status;

	u32			ret_status;

	int				i;

	int				i;
@@ -1611,11 +1611,11 @@ bfa_flash_status_read(void __iomem *pci_bar) 
}

}





/* Start flash read operation. */

/* Start flash read operation. */

static u32

static int

bfa_flash_read_start(void __iomem *pci_bar, u32 offset, u32 len,

bfa_flash_read_start(void __iomem *pci_bar, u32 offset, u32 len,

		     char *buf)

		     char *buf)

{

{

	u32 status;

	int status;





	/* len must be mutiple of 4 and not exceeding fifo size */

	/* len must be mutiple of 4 and not exceeding fifo size */

	if (len == 0 || len > BFA_FLASH_FIFO_SIZE || (len & 0x03) != 0)

	if (len == 0 || len > BFA_FLASH_FIFO_SIZE || (len & 0x03) != 0)
@@ -1703,7 +1703,8 @@ static enum bfa_status 
bfa_flash_raw_read(void __iomem *pci_bar, u32 offset, char *buf,

bfa_flash_raw_read(void __iomem *pci_bar, u32 offset, char *buf,

		   u32 len)

		   u32 len)

{

{

	u32 n, status;

	u32 n;

	int status;

	u32 off, l, s, residue, fifo_sz;

	u32 off, l, s, residue, fifo_sz;





	residue = len;

	residue = len;

drivers/net/ethernet/hisilicon/hip04_eth.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -816,7 +816,7 @@ static int hip04_mac_probe(struct platform_device *pdev) 
	struct net_device *ndev;

	struct net_device *ndev;

	struct hip04_priv *priv;

	struct hip04_priv *priv;

	struct resource *res;

	struct resource *res;

	unsigned int irq;

	int irq;

	int ret;

	int ret;





	ndev = alloc_etherdev(sizeof(struct hip04_priv));

	ndev = alloc_etherdev(sizeof(struct hip04_priv));

drivers/net/ethernet/ibm/emac/core.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -460,8 +460,8 @@ struct emac_ethtool_regs_subhdr { 
	u32 index;

	u32 index;

};

};





#define EMAC_ETHTOOL_REGS_VER		0

#define EMAC_ETHTOOL_REGS_VER		3

#define EMAC4_ETHTOOL_REGS_VER		1

#define EMAC4_ETHTOOL_REGS_VER		4

#define EMAC4SYNC_ETHTOOL_REGS_VER	2

#define EMAC4SYNC_ETHTOOL_REGS_VER	5





#endif /* __IBM_NEWEMAC_CORE_H */
 
#endif /* __IBM_NEWEMAC_CORE_H */