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

Commit 174808af authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull networking fixes from David Miller:

 1) Fix bluetooth userland regression reported by Keith Packard, from
    Gustavo Padovan.

 2) Revert ath9k PS idle change, from Sujith Manoharan.

 3) Correct default TCP memory limits (again), from Eric Dumazet.

 4) Fix tcp_rcv_rtt_update() accidental use of unscaled RTT, from Neal
    Cardwell.

 5) We made a facility for layers like wireless to say how much tailroom
    they need in the SKB for link layer stuff such as wireless
    encryption etc., but TCP works hard to fill every SKB out to the end
    defeating this specification.

    This leads to every TCP packet getting reallocated by the wireless
    code in order to have the right amount of tailroom available.

    Fix TCP to only fill SKBs out to the real amount of data area it
    asked for during the allocation, this way it won't eat into the
    slack added for the device's tailroom needs.

    Reported by Marc Merlin and fixed by Eric Dumazet.

 6) Leaks, endian bugs, and new device IDs in bluetooth from Santosh
    Nayak, João Paulo Rechi Vita, Cho, Yu-Chen, Andrei Emeltchenko,
    AceLan Kao, and Andrei Emeltchenko.

 7) OOPS on tty_close fix in bluetooth's hci_ldisc from Johan Hovold.

 8) netfilter erroneously scales TCP window twice, fix from Changli Gao.

 9) Memleak fix in wext-core from Julia Lawall.

10) Consistently handle invalid TCP packets in ipv4 vs.  ipv6 conntrack,
    from Jozsef Kadlecsik.

11) Validate IP header length properly in netfilter conntrack's
    ipv4_get_l4proto().

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (39 commits)
  NFC: Fix the LLCP Tx fragmentation loop
  rtlwifi: Add missing DMA buffer unmapping for PCI drivers
  rtlwifi: Preallocate USB read buffers and eliminate kalloc in read routine
  tcp: avoid order-1 allocations on wifi and tx path
  net: allow pskb_expand_head() to get maximum tailroom
  bridge: Do not send queries on multicast group leaves
  MAINTAINERS: Mark NATSEMI driver as orphan'd.
  tcp: fix tcp_rcv_rtt_update() use of an unscaled RTT sample
  tcp: restore correct limit
  Revert "ath9k: fix going to full-sleep on PS idle"
  rt2x00: Fix rfkill_polling register function.
  bcma: fix build error on MIPS; implicit pcibios_enable_device
  netfilter: nf_conntrack: fix incorrect logic in nf_conntrack_init_net
  netfilter: nf_ct_ipv4: packets with wrong ihl are invalid
  netfilter: nf_ct_ipv4: handle invalid IPv4 and IPv6 packets consistently
  net/wireless/wext-core.c: add missing kfree
  rtlwifi: Fix oops on rate-control failure
  mac80211: Convert WARN_ON to WARN_ON_ONCE
  rtlwifi: rtl8192de: Fix firmware initialization
  nl80211: ensure interface is up in various APIs
  ...
parents 778c2dee 5d949944
Loading
Loading
Loading
Loading
+5 −6
Original line number Original line Diff line number Diff line
@@ -1521,8 +1521,8 @@ M: Gustavo Padovan <gustavo@padovan.org>
M:	Johan Hedberg <johan.hedberg@gmail.com>
M:	Johan Hedberg <johan.hedberg@gmail.com>
L:	linux-bluetooth@vger.kernel.org
L:	linux-bluetooth@vger.kernel.org
W:	http://www.bluez.org/
W:	http://www.bluez.org/
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
S:	Maintained
S:	Maintained
F:	drivers/bluetooth/
F:	drivers/bluetooth/


@@ -1532,8 +1532,8 @@ M: Gustavo Padovan <gustavo@padovan.org>
M:	Johan Hedberg <johan.hedberg@gmail.com>
M:	Johan Hedberg <johan.hedberg@gmail.com>
L:	linux-bluetooth@vger.kernel.org
L:	linux-bluetooth@vger.kernel.org
W:	http://www.bluez.org/
W:	http://www.bluez.org/
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jh/bluetooth.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
S:	Maintained
S:	Maintained
F:	net/bluetooth/
F:	net/bluetooth/
F:	include/net/bluetooth/
F:	include/net/bluetooth/
@@ -4533,8 +4533,7 @@ S: Supported
F:	drivers/net/ethernet/myricom/myri10ge/
F:	drivers/net/ethernet/myricom/myri10ge/


NATSEMI ETHERNET DRIVER (DP8381x)
NATSEMI ETHERNET DRIVER (DP8381x)
M:	Tim Hockin <thockin@hockin.org>
S:	Orphan
S:	Maintained
F:	drivers/net/ethernet/natsemi/natsemi.c
F:	drivers/net/ethernet/natsemi/natsemi.c


NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ config BCMA_HOST_PCI


config BCMA_DRIVER_PCI_HOSTMODE
config BCMA_DRIVER_PCI_HOSTMODE
	bool "Driver for PCI core working in hostmode"
	bool "Driver for PCI core working in hostmode"
	depends on BCMA && MIPS
	depends on BCMA && MIPS && BCMA_HOST_PCI
	help
	help
	  PCI core hostmode operation (external PCI bus).
	  PCI core hostmode operation (external PCI bus).


+1 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@
 */
 */


#include "bcma_private.h"
#include "bcma_private.h"
#include <linux/pci.h>
#include <linux/export.h>
#include <linux/export.h>
#include <linux/bcma/bcma.h>
#include <linux/bcma/bcma.h>
#include <asm/paccess.h>
#include <asm/paccess.h>
+4 −0
Original line number Original line Diff line number Diff line
@@ -72,7 +72,9 @@ static struct usb_device_id ath3k_table[] = {


	/* Atheros AR3012 with sflash firmware*/
	/* Atheros AR3012 with sflash firmware*/
	{ USB_DEVICE(0x0CF3, 0x3004) },
	{ USB_DEVICE(0x0CF3, 0x3004) },
	{ USB_DEVICE(0x0CF3, 0x311D) },
	{ USB_DEVICE(0x13d3, 0x3375) },
	{ USB_DEVICE(0x13d3, 0x3375) },
	{ USB_DEVICE(0x04CA, 0x3005) },


	/* Atheros AR5BBU12 with sflash firmware */
	/* Atheros AR5BBU12 with sflash firmware */
	{ USB_DEVICE(0x0489, 0xE02C) },
	{ USB_DEVICE(0x0489, 0xE02C) },
@@ -89,7 +91,9 @@ static struct usb_device_id ath3k_blist_tbl[] = {


	/* Atheros AR3012 with sflash firmware*/
	/* Atheros AR3012 with sflash firmware*/
	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },


	{ }	/* Terminating entry */
	{ }	/* Terminating entry */
};
};
+4 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,7 @@ static struct usb_device_id btusb_table[] = {
	{ USB_DEVICE_INFO(0xe0, 0x01, 0x01) },
	{ USB_DEVICE_INFO(0xe0, 0x01, 0x01) },


	/* Broadcom SoftSailing reporting vendor specific */
	/* Broadcom SoftSailing reporting vendor specific */
	{ USB_DEVICE(0x05ac, 0x21e1) },
	{ USB_DEVICE(0x0a5c, 0x21e1) },


	/* Apple MacBookPro 7,1 */
	/* Apple MacBookPro 7,1 */
	{ USB_DEVICE(0x05ac, 0x8213) },
	{ USB_DEVICE(0x05ac, 0x8213) },
@@ -103,6 +103,7 @@ static struct usb_device_id btusb_table[] = {
	/* Broadcom BCM20702A0 */
	/* Broadcom BCM20702A0 */
	{ USB_DEVICE(0x0a5c, 0x21e3) },
	{ USB_DEVICE(0x0a5c, 0x21e3) },
	{ USB_DEVICE(0x0a5c, 0x21e6) },
	{ USB_DEVICE(0x0a5c, 0x21e6) },
	{ USB_DEVICE(0x0a5c, 0x21e8) },
	{ USB_DEVICE(0x0a5c, 0x21f3) },
	{ USB_DEVICE(0x0a5c, 0x21f3) },
	{ USB_DEVICE(0x413c, 0x8197) },
	{ USB_DEVICE(0x413c, 0x8197) },


@@ -129,7 +130,9 @@ static struct usb_device_id blacklist_table[] = {


	/* Atheros 3012 with sflash firmware */
	/* Atheros 3012 with sflash firmware */
	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },


	/* Atheros AR5BBU12 with sflash firmware */
	/* Atheros AR5BBU12 with sflash firmware */
	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
Loading