• L
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 174808af
    Linus Torvalds 提交于
    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
      ...
    174808af
tcp.c 86.5 KB