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

Commit c84afab0 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 ppp_mppe crypto soft dependencies, from Takashi Iawi.

 2) Fix TX completion to be finite, from Sergej Benilov.

 3) Use register_pernet_device to avoid a dst leak in tipc, from Xin
    Long.

 4) Double free of TX cleanup in Dirk van der Merwe.

 5) Memory leak in packet_set_ring(), from Eric Dumazet.

 6) Out of bounds read in qmi_wwan, from Bjørn Mork.

 7) Fix iif used in mcast/bcast looped back packets, from Stephen
    Suryaputra.

 8) Fix neighbour resolution on raw ipv6 sockets, from Nicolas Dichtel.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (25 commits)
  af_packet: Block execution of tasks waiting for transmit to complete in AF_PACKET
  sctp: change to hold sk after auth shkey is created successfully
  ipv6: fix neighbour resolution with raw socket
  ipv6: constify rt6_nexthop()
  net: dsa: microchip: Use gpiod_set_value_cansleep()
  net: aquantia: fix vlans not working over bridged network
  ipv4: reset rt_iif for recirculated mcast/bcast out pkts
  team: Always enable vlan tx offload
  net/smc: Fix error path in smc_init
  net/smc: hold conns_lock before calling smc_lgr_register_conn()
  bonding: Always enable vlan tx offload
  net/ipv6: Fix misuse of proc_dointvec "skip_notify_on_dev_down"
  ipv4: Use return value of inet_iif() for __raw_v4_lookup in the while loop
  qmi_wwan: Fix out-of-bounds read
  tipc: check msg->req data len in tipc_nl_compat_bearer_disable
  net: macb: do not copy the mac address if NULL
  net/packet: fix memory leak in packet_set_ring()
  net/tls: fix page double free on TX cleanup
  net/sched: cbs: Fix error path of cbs_module_init
  tipc: change to use register_pernet_device
  ...
parents 249155c2 89ed5b51

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -4320,12 +4320,12 @@ void bond_setup(struct net_device *bond_dev) 
	bond_dev->features |= NETIF_F_NETNS_LOCAL;



	bond_dev->hw_features = BOND_VLAN_FEATURES |

				NETIF_F_HW_VLAN_CTAG_TX |

				NETIF_F_HW_VLAN_CTAG_RX |

				NETIF_F_HW_VLAN_CTAG_FILTER;



	bond_dev->hw_features |= NETIF_F_GSO_ENCAP_ALL | NETIF_F_GSO_UDP_L4;

	bond_dev->features |= bond_dev->hw_features;

	bond_dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX;

}



/* Destroy a bonding device.

drivers/net/dsa/microchip/ksz_common.c

+3 −3
Original line number Diff line number Diff line
@@ -436,9 +436,9 @@ int ksz_switch_register(struct ksz_device *dev, 
		return PTR_ERR(dev->reset_gpio);



	if (dev->reset_gpio) {

		gpiod_set_value(dev->reset_gpio, 1);

		gpiod_set_value_cansleep(dev->reset_gpio, 1);

		mdelay(10);

		gpiod_set_value(dev->reset_gpio, 0);

		gpiod_set_value_cansleep(dev->reset_gpio, 0);

	}



	mutex_init(&dev->dev_mutex);
@@ -487,7 +487,7 @@ void ksz_switch_remove(struct ksz_device *dev) 
	dsa_unregister_switch(dev->ds);



	if (dev->reset_gpio)

		gpiod_set_value(dev->reset_gpio, 1);

		gpiod_set_value_cansleep(dev->reset_gpio, 1);



}

EXPORT_SYMBOL(ksz_switch_remove);

drivers/net/ethernet/aquantia/atlantic/aq_filters.c

+8 −2
Original line number Diff line number Diff line
@@ -843,9 +843,14 @@ int aq_filters_vlans_update(struct aq_nic_s *aq_nic) 
		return err;



	if (aq_nic->ndev->features & NETIF_F_HW_VLAN_CTAG_FILTER) {

		if (hweight < AQ_VLAN_MAX_FILTERS)

			err = aq_hw_ops->hw_filter_vlan_ctrl(aq_hw, true);

		if (hweight < AQ_VLAN_MAX_FILTERS && hweight > 0) {

			err = aq_hw_ops->hw_filter_vlan_ctrl(aq_hw,

				!(aq_nic->packet_filter & IFF_PROMISC));

			aq_nic->aq_nic_cfg.is_vlan_force_promisc = false;

		} else {

		/* otherwise left in promiscue mode */

			aq_nic->aq_nic_cfg.is_vlan_force_promisc = true;

		}

	}



	return err;
@@ -866,6 +871,7 @@ int aq_filters_vlan_offload_off(struct aq_nic_s *aq_nic) 
	if (unlikely(!aq_hw_ops->hw_filter_vlan_ctrl))

		return -EOPNOTSUPP;



	aq_nic->aq_nic_cfg.is_vlan_force_promisc = true;

	err = aq_hw_ops->hw_filter_vlan_ctrl(aq_hw, false);

	if (err)

		return err;

drivers/net/ethernet/aquantia/atlantic/aq_nic.c

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ void aq_nic_cfg_start(struct aq_nic_s *self) 


	cfg->link_speed_msk &= cfg->aq_hw_caps->link_speed_msk;

	cfg->features = cfg->aq_hw_caps->hw_features;

	cfg->is_vlan_force_promisc = true;

}



static int aq_nic_update_link_status(struct aq_nic_s *self)

drivers/net/ethernet/aquantia/atlantic/aq_nic.h

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ struct aq_nic_cfg_s { 
	u32 flow_control;

	u32 link_speed_msk;

	u32 wol;

	bool is_vlan_force_promisc;

	u16 is_mc_list_enabled;

	u16 mc_list_count;

	bool is_autoneg;