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

Commit f760b87f 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) Missing list head init in bluetooth hidp session creation, from Tedd
    Ho-Jeong An.

 2) Don't leak SKB in bridge netfilter error paths, from Florian
    Westphal.

 3) ipv6 netdevice private leak in netfilter bridging, fixed by Julien
    Grall.

 4) Fix regression in IP over hamradio bpq encapsulation, from Ralf
    Baechle.

 5) Fix race between rhashtable resize events and table walks, from Phil
    Sutter.

 6) Missing validation of IFLA_VF_INFO netlink attributes, fix from
    Daniel Borkmann.

 7) Missing security layer socket state initialization in tipc code,
    from Stephen Smalley.

 8) Fix shared IRQ handling in boomerang 3c59x interrupt handler, from
    Denys Vlasenko.

 9) Missing minor_idr destroy on module unload on macvtap driver, from
    Johannes Thumshirn.

10) Various pktgen kernel thread races, from Oleg Nesterov.

11) Fix races that can cause packets to be processed in the backlog even
    after a device attached to that SKB has been fully unregistered.
    From Julian Anastasov.

12) bcmgenet driver doesn't account packet drops vs.  errors properly,
    fix from Petri Gynther.

13) Array index validation and off by one fix in DSA layer from Florian
    Fainelli

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (66 commits)
  can: replace timestamp as unique skb attribute
  ARM: dts: dra7x-evm: Prevent glitch on DCAN1 pinmux
  can: c_can: Fix default pinmux glitch at init
  can: rcar_can: unify error messages
  can: rcar_can: print request_irq() error code
  can: rcar_can: fix typo in error message
  can: rcar_can: print signed IRQ #
  can: rcar_can: fix IRQ check
  net: dsa: Fix off-by-one in switch address parsing
  net: dsa: Test array index before use
  net: switchdev: don't abort unsupported operations
  net: bcmgenet: fix accounting of packet drops vs errors
  cdc_ncm: update specs URL
  Doc: z8530book: Fix typo in API-z8530-sync-txdma-open.html
  net: inet_diag: always export IPV6_V6ONLY sockopt for listening sockets
  bridge: mdb: allow the user to delete mdb entry if there's a querier
  net: call rcu_read_lock early in process_backlog
  net: do not process device backlog during unregistration
  bridge: fix potential crash in __netdev_pick_tx()
  net: axienet: Fix devm_ioremap_resource return value check
  ...
parents 34bef46e cee9f6d0

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -7019,6 +7019,7 @@ F: include/uapi/linux/netfilter/ 
F:	net/*/netfilter.c

F:	net/*/netfilter/

F:	net/netfilter/

F:	net/bridge/br_netfilter*.c



NETLABEL

M:	Paul Moore <paul@paul-moore.com>

arch/arm/boot/dts/dra7-evm.dts

+3 −2
Original line number Diff line number Diff line
@@ -686,7 +686,8 @@ 


&dcan1 {

	status = "ok";

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&dcan1_pins_default>;

	pinctrl-names = "default", "sleep", "active";

	pinctrl-0 = <&dcan1_pins_sleep>;

	pinctrl-1 = <&dcan1_pins_sleep>;

	pinctrl-2 = <&dcan1_pins_default>;

};

arch/arm/boot/dts/dra72-evm.dts

+3 −2
Original line number Diff line number Diff line
@@ -587,9 +587,10 @@ 


&dcan1 {

	status = "ok";

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&dcan1_pins_default>;

	pinctrl-names = "default", "sleep", "active";

	pinctrl-0 = <&dcan1_pins_sleep>;

	pinctrl-1 = <&dcan1_pins_sleep>;

	pinctrl-2 = <&dcan1_pins_default>;

};



&qspi {

drivers/net/bonding/bond_main.c

+34 −17
Original line number Diff line number Diff line
@@ -689,40 +689,57 @@ static void bond_do_fail_over_mac(struct bonding *bond, 


}



static bool bond_should_change_active(struct bonding *bond)

static struct slave *bond_choose_primary_or_current(struct bonding *bond)

{

	struct slave *prim = rtnl_dereference(bond->primary_slave);

	struct slave *curr = rtnl_dereference(bond->curr_active_slave);



	if (!prim || !curr || curr->link != BOND_LINK_UP)

		return true;

	if (!prim || prim->link != BOND_LINK_UP) {

		if (!curr || curr->link != BOND_LINK_UP)

			return NULL;

		return curr;

	}



	if (bond->force_primary) {

		bond->force_primary = false;

		return true;

		return prim;

	}



	if (!curr || curr->link != BOND_LINK_UP)

		return prim;



	/* At this point, prim and curr are both up */

	switch (bond->params.primary_reselect) {

	case BOND_PRI_RESELECT_ALWAYS:

		return prim;

	case BOND_PRI_RESELECT_BETTER:

		if (prim->speed < curr->speed)

			return curr;

		if (prim->speed == curr->speed && prim->duplex <= curr->duplex)

			return curr;

		return prim;

	case BOND_PRI_RESELECT_FAILURE:

		return curr;

	default:

		netdev_err(bond->dev, "impossible primary_reselect %d\n",

			   bond->params.primary_reselect);

		return curr;

	}

	if (bond->params.primary_reselect == BOND_PRI_RESELECT_BETTER &&

	    (prim->speed < curr->speed ||

	     (prim->speed == curr->speed && prim->duplex <= curr->duplex)))

		return false;

	if (bond->params.primary_reselect == BOND_PRI_RESELECT_FAILURE)

		return false;

	return true;

}



/**

 * find_best_interface - select the best available slave to be the active one

 * bond_find_best_slave - select the best available slave to be the active one

 * @bond: our bonding struct

 */

static struct slave *bond_find_best_slave(struct bonding *bond)

{

	struct slave *slave, *bestslave = NULL, *primary;

	struct slave *slave, *bestslave = NULL;

	struct list_head *iter;

	int mintime = bond->params.updelay;



	primary = rtnl_dereference(bond->primary_slave);

	if (primary && primary->link == BOND_LINK_UP &&

	    bond_should_change_active(bond))

		return primary;

	slave = bond_choose_primary_or_current(bond);

	if (slave)

		return slave;



	bond_for_each_slave(bond, slave, iter) {

		if (slave->link == BOND_LINK_UP)

drivers/net/can/c_can/c_can.c

+8 −2
Original line number Diff line number Diff line
@@ -592,6 +592,7 @@ static int c_can_start(struct net_device *dev) 
{

	struct c_can_priv *priv = netdev_priv(dev);

	int err;

	struct pinctrl *p;



	/* basic c_can configuration */

	err = c_can_chip_config(dev);
@@ -604,8 +605,13 @@ static int c_can_start(struct net_device *dev) 


	priv->can.state = CAN_STATE_ERROR_ACTIVE;



	/* activate pins */

	pinctrl_pm_select_default_state(dev->dev.parent);

	/* Attempt to use "active" if available else use "default" */

	p = pinctrl_get_select(priv->device, "active");

	if (!IS_ERR(p))

		pinctrl_put(p);

	else

		pinctrl_pm_select_default_state(priv->device);



	return 0;

}