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

Commit 6741d516 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 state pruning in bpf verifier wrt. alignment, from Daniel
    Borkmann.

 2) Handle non-linear SKBs properly in SCTP ICMP parsing, from Davide
    Caratti.

 3) Fix bit field definitions for rss_hash_type of descriptors in mlx5
    driver, from Jesper Brouer.

 4) Defer slave->link updates until bonding is ready to do a full commit
    to the new settings, from Nithin Sujir.

 5) Properly reference count ipv4 FIB metrics to avoid use after free
    situations, from Eric Dumazet and several others including Cong Wang
    and Julian Anastasov.

 6) Fix races in llc_ui_bind(), from Lin Zhang.

 7) Fix regression of ESP UDP encapsulation for TCP packets, from
    Steffen Klassert.

 8) Fix mdio-octeon driver Kconfig deps, from Randy Dunlap.

 9) Fix regression in setting DSCP on ipv6/GRE encapsulation, from Peter
    Dawson.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (43 commits)
  ipv4: add reference counting to metrics
  net: ethernet: ax88796: don't call free_irq without request_irq first
  ip6_tunnel, ip6_gre: fix setting of DSCP on encapsulated packets
  sctp: fix ICMP processing if skb is non-linear
  net: llc: add lock_sock in llc_ui_bind to avoid a race condition
  bonding: Don't update slave->link until ready to commit
  test_bpf: Add a couple of tests for BPF_JSGE.
  bpf: add various verifier test cases
  bpf: fix wrong exposure of map_flags into fdinfo for lpm
  bpf: add bpf_clone_redirect to bpf_helper_changes_pkt_data
  bpf: properly reset caller saved regs after helper call and ld_abs/ind
  bpf: fix incorrect pruning decision when alignment must be tracked
  arp: fixed -Wuninitialized compiler warning
  tcp: avoid fastopen API to be used on AF_UNSPEC
  net: move somaxconn init from sysctl code
  net: fix potential null pointer dereference
  geneve: fix fill_info when using collect_metadata
  virtio-net: enable TSO/checksum offloads for Q-in-Q vlans
  be2net: Fix offload features for Q-in-Q packets
  vlan: Fix tcp checksum offloads in Q-in-Q vlans
  ...
parents cdbe0206 3fb07daf

Documentation/devicetree/bindings/net/fsl-fec.txt

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ Optional properties: 
- phy-reset-active-high : If present then the reset sequence using the GPIO

  specified in the "phy-reset-gpios" property is reversed (H=reset state,

  L=operation state).

- phy-reset-post-delay : Post reset delay in milliseconds. If present then

  a delay of phy-reset-post-delay milliseconds will be observed after the

  phy-reset-gpios has been toggled. Can be omitted thus no delay is

  observed. Delay is in range of 1ms to 1000ms. Other delays are invalid.

- phy-supply : regulator that powers the Ethernet PHY.

- phy-handle : phandle to the PHY device connected to this device.

- fixed-link : Assume a fixed link. See fixed-link.txt in the same directory.

drivers/net/bonding/bond_main.c

+9 −2
Original line number Diff line number Diff line
@@ -2612,11 +2612,13 @@ static void bond_loadbalance_arp_mon(struct bonding *bond) 
	bond_for_each_slave_rcu(bond, slave, iter) {

		unsigned long trans_start = dev_trans_start(slave->dev);



		slave->new_link = BOND_LINK_NOCHANGE;



		if (slave->link != BOND_LINK_UP) {

			if (bond_time_in_interval(bond, trans_start, 1) &&

			    bond_time_in_interval(bond, slave->last_rx, 1)) {



				slave->link  = BOND_LINK_UP;

				slave->new_link = BOND_LINK_UP;

				slave_state_changed = 1;



				/* primary_slave has no meaning in round-robin
@@ -2643,7 +2645,7 @@ static void bond_loadbalance_arp_mon(struct bonding *bond) 
			if (!bond_time_in_interval(bond, trans_start, 2) ||

			    !bond_time_in_interval(bond, slave->last_rx, 2)) {



				slave->link  = BOND_LINK_DOWN;

				slave->new_link = BOND_LINK_DOWN;

				slave_state_changed = 1;



				if (slave->link_failure_count < UINT_MAX)
@@ -2674,6 +2676,11 @@ static void bond_loadbalance_arp_mon(struct bonding *bond) 
		if (!rtnl_trylock())

			goto re_arm;



		bond_for_each_slave(bond, slave, iter) {

			if (slave->new_link != BOND_LINK_NOCHANGE)

				slave->link = slave->new_link;

		}



		if (slave_state_changed) {

			bond_slave_state_change(bond);

			if (BOND_MODE(bond) == BOND_MODE_XOR)

drivers/net/ethernet/8390/ax88796.c

+2 −5
Original line number Diff line number Diff line
@@ -748,13 +748,13 @@ static int ax_init_dev(struct net_device *dev) 


	ret = ax_mii_init(dev);

	if (ret)

		goto out_irq;

		goto err_out;



	ax_NS8390_init(dev, 0);



	ret = register_netdev(dev);

	if (ret)

		goto out_irq;

		goto err_out;



	netdev_info(dev, "%dbit, irq %d, %lx, MAC: %pM\n",

		    ei_local->word16 ? 16 : 8, dev->irq, dev->base_addr,
@@ -762,9 +762,6 @@ static int ax_init_dev(struct net_device *dev) 


	return 0;



 out_irq:

	/* cleanup irq */

	free_irq(dev->irq, dev);

 err_out:

	return ret;

}

drivers/net/ethernet/emulex/benet/be_main.c

+3 −1
Original line number Diff line number Diff line
@@ -5078,9 +5078,11 @@ static netdev_features_t be_features_check(struct sk_buff *skb, 
	struct be_adapter *adapter = netdev_priv(dev);

	u8 l4_hdr = 0;



	/* The code below restricts offload features for some tunneled packets.

	/* The code below restricts offload features for some tunneled and

	 * Q-in-Q packets.

	 * Offload features for normal (non tunnel) packets are unchanged.

	 */

	features = vlan_features_check(skb, features);

	if (!skb->encapsulation ||

	    !(adapter->flags & BE_FLAGS_VXLAN_OFFLOADS))

		return features;

drivers/net/ethernet/freescale/fec_main.c

+15 −1
Original line number Diff line number Diff line
@@ -3192,7 +3192,7 @@ static int fec_reset_phy(struct platform_device *pdev) 
{

	int err, phy_reset;

	bool active_high = false;

	int msec = 1;

	int msec = 1, phy_post_delay = 0;

	struct device_node *np = pdev->dev.of_node;



	if (!np)
@@ -3209,6 +3209,11 @@ static int fec_reset_phy(struct platform_device *pdev) 
	else if (!gpio_is_valid(phy_reset))

		return 0;



	err = of_property_read_u32(np, "phy-reset-post-delay", &phy_post_delay);

	/* valid reset duration should be less than 1s */

	if (!err && phy_post_delay > 1000)

		return -EINVAL;



	active_high = of_property_read_bool(np, "phy-reset-active-high");



	err = devm_gpio_request_one(&pdev->dev, phy_reset,
@@ -3226,6 +3231,15 @@ static int fec_reset_phy(struct platform_device *pdev) 


	gpio_set_value_cansleep(phy_reset, !active_high);



	if (!phy_post_delay)

		return 0;



	if (phy_post_delay > 20)

		msleep(phy_post_delay);

	else

		usleep_range(phy_post_delay * 1000,

			     phy_post_delay * 1000 + 1000);



	return 0;

}

#else /* CONFIG_OF */