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

Commit eef8f4c2 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) Socket addresses returned in the error queue need to be fully
    initialized before being passed on to userspace, fix from Willem de
    Bruijn.

 2) Interrupt handling fixes to davinci_emac driver from Tony Lindgren.

 3) Fix races between receive packet steering and cpu hotplug, from Eric
    Dumazet.

 4) Allowing netlink sockets to subscribe to unknown multicast groups
    leads to crashes, don't allow it.  From Johannes Berg.

 5) One to many socket races in SCTP fixed by Daniel Borkmann.

 6) Put in a guard against the mis-use of ipv6 atomic fragments, from
    Hagen Paul Pfeifer.

 7) Fix promisc mode and ethtool crashes in sh_eth driver, from Ben
    Hutchings.

 8) NULL deref and double kfree fix in sxgbe driver from Girish K.S and
    Byungho An.

 9) cfg80211 deadlock fix from Arik Nemtsov.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (36 commits)
  s2io: use snprintf() as a safety feature
  r8152: remove sram_read
  r8152: remove generic_ocp_read before writing
  bgmac: activate irqs only if there is nothing to poll
  bgmac: register napi before the device
  sh_eth: Fix ethtool operation crash when net device is down
  sh_eth: Fix promiscuous mode on chips without TSU
  ipv6: stop sending PTB packets for MTU < 1280
  net: sctp: fix race for one-to-many sockets in sendmsg's auto associate
  genetlink: synchronize socket closing and family removal
  genetlink: disallow subscribing to unknown mcast groups
  genetlink: document parallel_ops
  net: rps: fix cpu unplug
  net: davinci_emac: Add support for emac on dm816x
  net: davinci_emac: Fix ioremap for devices with MDIO within the EMAC address space
  net: davinci_emac: Fix incomplete code for getting the phy from device tree
  net: davinci_emac: Free clock after checking the frequency
  net: davinci_emac: Fix runtime pm calls for davinci_emac
  net: davinci_emac: Fix hangs with interrupts
  ip: zero sockaddr returned on error queue
  ...
parents 22628890 a8c1d28a

Documentation/devicetree/bindings/net/davinci_emac.txt

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ This file provides information, what the device node 
for the davinci_emac interface contains.



Required properties:

- compatible: "ti,davinci-dm6467-emac" or "ti,am3517-emac"

- compatible: "ti,davinci-dm6467-emac", "ti,am3517-emac" or

  "ti,dm816-emac"

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

- ti,davinci-ctrl-reg-offset: offset to control register

- ti,davinci-ctrl-mod-reg-offset: offset to control module register

MAINTAINERS

+4 −2
Original line number Diff line number Diff line
@@ -2346,7 +2346,8 @@ CAN NETWORK LAYER 
M:	Oliver Hartkopp <socketcan@hartkopp.net>

L:	linux-can@vger.kernel.org

W:	http://gitorious.org/linux-can

T:	git git://gitorious.org/linux-can/linux-can-next.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git

S:	Maintained

F:	Documentation/networking/can.txt

F:	net/can/
@@ -2361,7 +2362,8 @@ M: Wolfgang Grandegger <wg@grandegger.com> 
M:	Marc Kleine-Budde <mkl@pengutronix.de>

L:	linux-can@vger.kernel.org

W:	http://gitorious.org/linux-can

T:	git git://gitorious.org/linux-can/linux-can-next.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git

S:	Maintained

F:	drivers/net/can/

F:	include/linux/can/dev.h

drivers/infiniband/hw/mlx4/main.c

+2 −1
Original line number Diff line number Diff line
@@ -1114,7 +1114,8 @@ static int mlx4_ib_tunnel_steer_add(struct ib_qp *qp, struct ib_flow_attr *flow_ 
	struct mlx4_dev	*dev = to_mdev(qp->device)->dev;

	int err = 0;



	if (dev->caps.tunnel_offload_mode != MLX4_TUNNEL_OFFLOAD_MODE_VXLAN)

	if (dev->caps.tunnel_offload_mode != MLX4_TUNNEL_OFFLOAD_MODE_VXLAN ||

	    dev->caps.dmfs_high_steer_mode == MLX4_STEERING_DMFS_A0_STATIC)

		return 0; /* do nothing */



	ib_flow = flow_attr + 1;

drivers/net/can/c_can/c_can_platform.c

+18 −11
Original line number Diff line number Diff line
@@ -103,27 +103,34 @@ static void c_can_hw_raminit_syscon(const struct c_can_priv *priv, bool enable) 
	mask = 1 << raminit->bits.start | 1 << raminit->bits.done;

	regmap_read(raminit->syscon, raminit->reg, &ctrl);



	/* We clear the done and start bit first. The start bit is

	/* We clear the start bit first. The start bit is

	 * looking at the 0 -> transition, but is not self clearing;

	 * And we clear the init done bit as well.

	 * NOTE: DONE must be written with 1 to clear it.

	 * We can't clear the DONE bit here using regmap_update_bits()

	 * as it will bypass the write if initial condition is START:0 DONE:1

	 * e.g. on DRA7 which needs START pulse.

	 */

	ctrl &= ~(1 << raminit->bits.start);

	ctrl |= 1 << raminit->bits.done;

	regmap_write(raminit->syscon, raminit->reg, ctrl);

	ctrl &= ~mask;	/* START = 0, DONE = 0 */

	regmap_update_bits(raminit->syscon, raminit->reg, mask, ctrl);



	ctrl &= ~(1 << raminit->bits.done);

	c_can_hw_raminit_wait_syscon(priv, mask, ctrl);

	/* check if START bit is 0. Ignore DONE bit for now

	 * as it can be either 0 or 1.

	 */

	c_can_hw_raminit_wait_syscon(priv, 1 << raminit->bits.start, ctrl);



	if (enable) {

		/* Set start bit and wait for the done bit. */

		/* Clear DONE bit & set START bit. */

		ctrl |= 1 << raminit->bits.start;

		regmap_write(raminit->syscon, raminit->reg, ctrl);



		/* DONE must be written with 1 to clear it */

		ctrl |= 1 << raminit->bits.done;

		regmap_update_bits(raminit->syscon, raminit->reg, mask, ctrl);

		/* prevent further clearing of DONE bit */

		ctrl &= ~(1 << raminit->bits.done);

		/* clear START bit if start pulse is needed */

		if (raminit->needs_pulse) {

			ctrl &= ~(1 << raminit->bits.start);

			regmap_write(raminit->syscon, raminit->reg, ctrl);

			regmap_update_bits(raminit->syscon, raminit->reg,

					   mask, ctrl);

		}



		ctrl |= 1 << raminit->bits.done;

drivers/net/can/dev.c

+6 −2
Original line number Diff line number Diff line
@@ -807,10 +807,14 @@ static int can_changelink(struct net_device *dev, 
		if (dev->flags & IFF_UP)

			return -EBUSY;

		cm = nla_data(data[IFLA_CAN_CTRLMODE]);

		if (cm->flags & ~priv->ctrlmode_supported)



		/* check whether changed bits are allowed to be modified */

		if (cm->mask & ~priv->ctrlmode_supported)

			return -EOPNOTSUPP;



		/* clear bits to be modified and copy the flag values */

		priv->ctrlmode &= ~cm->mask;

		priv->ctrlmode |= cm->flags;

		priv->ctrlmode |= (cm->flags & cm->mask);



		/* CAN_CTRLMODE_FD can only be set when driver supports FD */

		if (priv->ctrlmode & CAN_CTRLMODE_FD)