Commit c5edde3a 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 memory leak in iwlwifi, from Matti Gottlieb.

 2) Add missing registration of netfilter arp_tables into initial
    namespace, from Florian Westphal.

 3) Fix potential NULL deref in DecNET routing code.

 4) Restrict NETLINK_URELEASE to truly bound sockets only, from Dmitry
    Ivanov.

 5) Fix dst ref counting in VRF, from David Ahern.

 6) Fix TSO segmenting limits in i40e driver, from Alexander Duyck.

 7) Fix heap leak in PACKET_DIAG_MCLIST, from Mathias Krause.

 8) Ravalidate IPV6 datagram socket cached routes properly, particularly
    with UDP, from Martin KaFai Lau.

 9) Fix endian bug in RDS dp_ack_seq handling, from Qing Huang.

10) Fix stats typing in bcmgenet driver, from Eric Dumazet.

11) Openvswitch needs to orphan SKBs before ipv6 fragmentation handing,
    from Joe Stringer.

12) SPI device reference leak in spi_ks8895 PHY driver, from Mark Brown.

13) atl2 doesn't actually support scatter-gather, so don't advertise the
    feature.  From Ben Hucthings.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (72 commits)
  openvswitch: use flow protocol when recalculating ipv6 checksums
  Driver: Vmxnet3: set CHECKSUM_UNNECESSARY for IPv6 packets
  atl2: Disable unimplemented scatter/gather feature
  net/mlx4_en: Split SW RX dropped counter per RX ring
  net/mlx4_core: Don't allow to VF change global pause settings
  net/mlx4_core: Avoid repeated calls to pci enable/disable
  net/mlx4_core: Implement pci_resume callback
  net: phy: spi_ks8895: Don't leak references to SPI devices
  net: ethernet: davinci_emac: Fix platform_data overwrite
  net: ethernet: davinci_emac: Fix Unbalanced pm_runtime_enable
  qede: Fix single MTU sized packet from firmware GRO flow
  qede: Fix setting Skb network header
  qede: Fix various memory allocation error flows for fastpath
  tcp: Merge tx_flags and tskey in tcp_shifted_skb
  tcp: Merge tx_flags and tskey in tcp_collapse_retrans
  drivers: net: cpsw: fix wrong regs access in cpsw_ndo_open
  tcp: Fix SOF_TIMESTAMPING_TX_ACK when handling dup acks
  openvswitch: Orphan skbs before IPv6 defrag
  Revert "Prevent NUll pointer dereference with two PHYs on cpsw"
  VSOCK: Only check error on skb_recv_datagram when skb is NULL
  ...
parents f862d66a b4f70527

Documentation/devicetree/bindings/net/mediatek-net.txt

+5 −2
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ have dual GMAC each represented by a child node.. 
Required properties:

- compatible: Should be "mediatek,mt7623-eth"

- reg: Address and length of the register set for the device

- interrupts: Should contain the frame engines interrupt

- interrupts: Should contain the three frame engines interrupts in numeric

	order. These are fe_int0, fe_int1 and fe_int2.

- clocks: the clock used by the core

- clock-names: the names of the clock listed in the clocks property. These are

	"ethif", "esw", "gp2", "gp1"
@@ -42,7 +43,9 @@ eth: ethernet@1b100000 { 
		 <&ethsys CLK_ETHSYS_GP2>,

		 <&ethsys CLK_ETHSYS_GP1>;

	clock-names = "ethif", "esw", "gp2", "gp1";

	interrupts = <GIC_SPI 200 IRQ_TYPE_LEVEL_LOW>;

	interrupts = <GIC_SPI 200 IRQ_TYPE_LEVEL_LOW

		      GIC_SPI 199 IRQ_TYPE_LEVEL_LOW

		      GIC_SPI 198 IRQ_TYPE_LEVEL_LOW>;

	power-domains = <&scpsys MT2701_POWER_DOMAIN_ETH>;

	resets = <&ethsys MT2701_ETHSYS_ETH_RST>;

	reset-names = "eth";

drivers/bcma/main.c

+4 −13
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ static bool bcma_is_core_needed_early(u16 core_id) 
	return false;

}



#if defined(CONFIG_OF) && defined(CONFIG_OF_ADDRESS)

static struct device_node *bcma_of_find_child_device(struct platform_device *parent,

						     struct bcma_device *core)

{
@@ -184,7 +183,7 @@ static unsigned int bcma_of_get_irq(struct platform_device *parent, 
	struct of_phandle_args out_irq;

	int ret;



	if (!parent || !parent->dev.of_node)

	if (!IS_ENABLED(CONFIG_OF_IRQ) || !parent || !parent->dev.of_node)

		return 0;



	ret = bcma_of_irq_parse(parent, core, &out_irq, num);
@@ -202,23 +201,15 @@ static void bcma_of_fill_device(struct platform_device *parent, 
{

	struct device_node *node;



	if (!IS_ENABLED(CONFIG_OF_IRQ))

		return;



	node = bcma_of_find_child_device(parent, core);

	if (node)

		core->dev.of_node = node;



	core->irq = bcma_of_get_irq(parent, core, 0);

}

#else

static void bcma_of_fill_device(struct platform_device *parent,

				struct bcma_device *core)

{

}

static inline unsigned int bcma_of_get_irq(struct platform_device *parent,

					   struct bcma_device *core, int num)

{

	return 0;

}

#endif /* CONFIG_OF */



unsigned int bcma_core_irq(struct bcma_device *core, int num)

{

drivers/isdn/mISDN/socket.c

+3 −0
Original line number Diff line number Diff line
@@ -715,6 +715,9 @@ base_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_len) 
	if (!maddr || maddr->family != AF_ISDN)

		return -EINVAL;



	if (addr_len < sizeof(struct sockaddr_mISDN))

		return -EINVAL;



	lock_sock(sk);



	if (_pms(sk)->dev) {

drivers/net/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ config GENEVE 


config MACSEC

	tristate "IEEE 802.1AE MAC-level encryption (MACsec)"

	select CRYPTO

	select CRYPTO_AES

	select CRYPTO_GCM

	---help---

drivers/net/dsa/mv88e6xxx.c

+5 −29
Original line number Diff line number Diff line
@@ -2181,27 +2181,10 @@ int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port, 
			       struct net_device *bridge)

{

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	u16 fid;

	int i, err;



	mutex_lock(&ps->smi_mutex);



	/* Get or create the bridge FID and assign it to the port */

	for (i = 0; i < ps->num_ports; ++i)

		if (ps->ports[i].bridge_dev == bridge)

			break;



	if (i < ps->num_ports)

		err = _mv88e6xxx_port_fid_get(ds, i, &fid);

	else

		err = _mv88e6xxx_fid_new(ds, &fid);

	if (err)

		goto unlock;



	err = _mv88e6xxx_port_fid_set(ds, port, fid);

	if (err)

		goto unlock;



	/* Assign the bridge and remap each port's VLANTable */

	ps->ports[port].bridge_dev = bridge;
@@ -2213,7 +2196,6 @@ int mv88e6xxx_port_bridge_join(struct dsa_switch *ds, int port, 
		}

	}



unlock:

	mutex_unlock(&ps->smi_mutex);



	return err;
@@ -2223,16 +2205,10 @@ void mv88e6xxx_port_bridge_leave(struct dsa_switch *ds, int port) 
{

	struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);

	struct net_device *bridge = ps->ports[port].bridge_dev;

	u16 fid;

	int i;



	mutex_lock(&ps->smi_mutex);



	/* Give the port a fresh Filtering Information Database */

	if (_mv88e6xxx_fid_new(ds, &fid) ||

	    _mv88e6xxx_port_fid_set(ds, port, fid))

		netdev_warn(ds->ports[port], "failed to assign a new FID\n");



	/* Unassign the bridge and remap each port's VLANTable */

	ps->ports[port].bridge_dev = NULL;
@@ -2476,9 +2452,9 @@ static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port) 
	 * the other bits clear.

	 */

	reg = 1 << port;

	/* Disable learning for DSA and CPU ports */

	if (dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port))

		reg = PORT_ASSOC_VECTOR_LOCKED_PORT;

	/* Disable learning for CPU port */

	if (dsa_is_cpu_port(ds, port))

		reg = 0;



	ret = _mv88e6xxx_reg_write(ds, REG_PORT(port), PORT_ASSOC_VECTOR, reg);

	if (ret)
@@ -2558,11 +2534,11 @@ static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port) 
	if (ret)

		goto abort;



	/* Port based VLAN map: give each port its own address

	/* Port based VLAN map: give each port the same default address

	 * database, and allow bidirectional communication between the

	 * CPU and DSA port(s), and the other ports.

	 */

	ret = _mv88e6xxx_port_fid_set(ds, port, port + 1);

	ret = _mv88e6xxx_port_fid_set(ds, port, 0);

	if (ret)

		goto abort;

CRA Git | Maintained and supported by SUSTech CRA and CCSE