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

Commit 2df4ee78 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 null deref in xt_TEE netfilter module, from Eric Dumazet.

 2) Several spots need to get to the original listner for SYN-ACK
    packets, most spots got this ok but some were not.  Whilst covering
    the remaining cases, create a helper to do this.  From Eric Dumazet.

 3) Missiing check of return value from alloc_netdev() in CAIF SPI code,
    from Rasmus Villemoes.

 4) Don't sleep while != TASK_RUNNING in macvtap, from Vlad Yasevich.

 5) Use after free in mvneta driver, from Justin Maggard.

 6) Fix race on dst->flags access in dst_release(), from Eric Dumazet.

 7) Add missing ZLIB_INFLATE dependency for new qed driver.  From Arnd
    Bergmann.

 8) Fix multicast getsockopt deadlock, from WANG Cong.

 9) Fix deadlock in btusb, from Kuba Pawlak.

10) Some ipv6_add_dev() failure paths were not cleaning up the SNMP6
    counter state.  From Sabrina Dubroca.

11) Fix packet_bind() race, which can cause lost notifications, from
    Francesco Ruggeri.

12) Fix MAC restoration in qlcnic driver during bonding mode changes,
    from Jarod Wilson.

13) Revert bridging forward delay change which broke libvirt and other
    userspace things, from Vlad Yasevich.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (65 commits)
  Revert "bridge: Allow forward delay to be cfgd when STP enabled"
  bpf_trace: Make dependent on PERF_EVENTS
  qed: select ZLIB_INFLATE
  net: fix a race in dst_release()
  net: mvneta: Fix memory use after free.
  net: Documentation: Fix default value tcp_limit_output_bytes
  macvtap: Resolve possible __might_sleep warning in macvtap_do_read()
  mvneta: add FIXED_PHY dependency
  net: caif: check return value of alloc_netdev
  net: hisilicon: NET_VENDOR_HISILICON should depend on HAS_DMA
  drivers: net: xgene: fix RGMII 10/100Mb mode
  netfilter: nft_meta: use skb_to_full_sk() helper
  net_sched: em_meta: use skb_to_full_sk() helper
  sched: cls_flow: use skb_to_full_sk() helper
  netfilter: xt_owner: use skb_to_full_sk() helper
  smack: use skb_to_full_sk() helper
  net: add skb_to_full_sk() helper and use it in selinux_netlbl_skbuff_setsid()
  bpf: doc: correct arch list for supported eBPF JIT
  dwc_eth_qos: Delete an unnecessary check before the function call "of_node_put"
  bonding: fix panic on non-ARPHRD_ETHER enslave failure
  ...
parents 3419b450 8a921265

Documentation/devicetree/bindings/net/cpsw.txt

+5 −0
Original line number Diff line number Diff line
@@ -48,6 +48,11 @@ Optional properties: 
- mac-address		: See ethernet.txt file in the same directory

- phy-handle		: See ethernet.txt file in the same directory



Slave sub-nodes:

- fixed-link		: See fixed-link.txt file in the same directory

			  Either the properties phy_id and phy-mode,

			  or the sub-node fixed-link can be specified



Note: "ti,hwmods" field is used to fetch the base address and irq

resources from TI, omap hwmod data base during device registration.

Future plan is to migrate hwmod data base contents into device tree

Documentation/networking/filter.txt

+3 −3
Original line number Diff line number Diff line
@@ -596,9 +596,9 @@ skb pointer). All constraints and restrictions from bpf_check_classic() apply 
before a conversion to the new layout is being done behind the scenes!



Currently, the classic BPF format is being used for JITing on most of the

architectures. Only x86-64 performs JIT compilation from eBPF instruction set,

however, future work will migrate other JIT compilers as well, so that they

will profit from the very same benefits.

architectures. x86-64, aarch64 and s390x perform JIT compilation from eBPF

instruction set, however, future work will migrate other JIT compilers as well,

so that they will profit from the very same benefits.



Some core changes of the new internal format:

Documentation/networking/ip-sysctl.txt

+1 −1
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ tcp_limit_output_bytes - INTEGER 
	typical pfifo_fast qdiscs.

	tcp_limit_output_bytes limits the number of bytes on qdisc

	or device to reduce artificial RTT/cwnd and reduce bufferbloat.

	Default: 131072

	Default: 262144



tcp_challenge_ack_limit - INTEGER

	Limits number of Challenge ACK sent per second, as recommended

drivers/bluetooth/btusb.c

+4 −2
Original line number Diff line number Diff line
@@ -1372,6 +1372,8 @@ static void btusb_work(struct work_struct *work) 
		}



		if (data->isoc_altsetting != new_alts) {

			unsigned long flags;



			clear_bit(BTUSB_ISOC_RUNNING, &data->flags);

			usb_kill_anchored_urbs(&data->isoc_anchor);
@@ -1384,10 +1386,10 @@ static void btusb_work(struct work_struct *work) 
			 * Clear outstanding fragment when selecting a new

			 * alternate setting.

			 */

			spin_lock(&data->rxlock);

			spin_lock_irqsave(&data->rxlock, flags);

			kfree_skb(data->sco_skb);

			data->sco_skb = NULL;

			spin_unlock(&data->rxlock);

			spin_unlock_irqrestore(&data->rxlock, flags);



			if (__set_isoc_interface(hdev, new_alts) < 0)

				return;

drivers/net/bonding/bond_main.c

+1 −0
Original line number Diff line number Diff line
@@ -1749,6 +1749,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) 
					    slave_dev->dev_addr))

			eth_hw_addr_random(bond_dev);

		if (bond_dev->type != ARPHRD_ETHER) {

			dev_close(bond_dev);

			ether_setup(bond_dev);

			bond_dev->flags |= IFF_MASTER;

			bond_dev->priv_flags &= ~IFF_TX_SKB_SHARING;