Skip to content
Snippets Groups Projects
  • Linus Torvalds's avatar
    110bc767
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 110bc767
    Linus Torvalds authored
    Pull networking fixes from David Miller:
    
     1) Handle max TX power properly wrt VIFs and the MAC in iwlwifi, from
        Avri Altman.
    
     2) Use the correct FW API for scan completions in iwlwifi, from Avraham
        Stern.
    
     3) FW monitor in iwlwifi accidently uses unmapped memory, fix from Liad
        Kaufman.
    
     4) rhashtable conversion of mac80211 station table was buggy, the
        virtual interface was not taken into account.  Fix from Johannes
        Berg.
    
     5) Fix deadlock in rtlwifi by not using a zero timeout for
        usb_control_msg(), from Larry Finger.
    
     6) Update reordering state before calculating loss detection, from
        Yuchung Cheng.
    
     7) Fix off by one in bluetooth firmward parsing, from Dan Carpenter.
    
     8) Fix extended frame handling in xiling_can driver, from Jeppe
        Ledet-Pedersen.
    
     9) Fix CODEL packet scheduler behavior in the presence of TSO packets,
        from Eric Dumazet.
    
    10) Fix NAPI budget testing in fm10k driver, from Alexander Duyck.
    
    11) macvlan needs to propagate promisc settings down the the lower
        device, from Vlad Yasevich.
    
    12) igb driver can oops when changing number of rings, from Toshiaki
        Makita.
    
    13) Source specific default routes not handled properly in ipv6, from
        Markus Stenberg.
    
    14) Use after free in tc_ctl_tfilter(), from WANG Cong.
    
    15) Use softirq spinlocking in netxen driver, from Tony Camuso.
    
    16) Two ARM bpf JIT fixes from Nicolas Schichan.
    
    17) Handle MSG_DONTWAIT properly in ring based AF_PACKET sends, from
        Mathias Kretschmer.
    
    18) Fix x86 bpf JIT implementation of FROM_{BE16,LE16,LE32}, from Alexei
        Starovoitov.
    
    19) ll_temac driver DMA maps TX packet header with incorrect length, fix
        from Michal Simek.
    
    20) We removed pm_qos bits from netdevice.h, but some indirect
        references remained.  Kill them.  From David Ahern.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (90 commits)
      net: Remove remaining remnants of pm_qos from netdevice.h
      e1000e: Add pm_qos header
      net: phy: micrel: Fix regression in kszphy_probe
      net: ll_temac: Fix DMA map size bug
      x86: bpf_jit: fix FROM_BE16 and FROM_LE16/32 instructions
      netns: return RTM_NEWNSID instead of RTM_GETNSID on a get
      Update be2net maintainers' email addresses
      net_sched: gred: use correct backlog value in WRED mode
      pppoe: drop pppoe device in pppoe_unbind_sock_work
      net: qca_spi: Fix possible race during probe
      net: mdio-gpio: Allow for unspecified bus id
      af_packet / TX_RING not fully non-blocking (w/ MSG_DONTWAIT).
      bnx2x: limit fw delay in kdump to 5s after boot
      ARM: net: delegate filter to kernel interpreter when imm_offset() return value can't fit into 12bits.
      ARM: net fix emit_udiv() for BPF_ALU | BPF_DIV | BPF_K intruction.
      mpls: Change reserved label names to be consistent with netbsd
      usbnet: avoid integer overflow in start_xmit
      netxen_nic: use spin_[un]lock_bh around tx_clean_lock (2)
      net: xgene_enet: Set hardware dependency
      net: amd-xgbe: Add hardware dependency
      ...
    110bc767
    History
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
    Linus Torvalds authored
    Pull networking fixes from David Miller:
    
     1) Handle max TX power properly wrt VIFs and the MAC in iwlwifi, from
        Avri Altman.
    
     2) Use the correct FW API for scan completions in iwlwifi, from Avraham
        Stern.
    
     3) FW monitor in iwlwifi accidently uses unmapped memory, fix from Liad
        Kaufman.
    
     4) rhashtable conversion of mac80211 station table was buggy, the
        virtual interface was not taken into account.  Fix from Johannes
        Berg.
    
     5) Fix deadlock in rtlwifi by not using a zero timeout for
        usb_control_msg(), from Larry Finger.
    
     6) Update reordering state before calculating loss detection, from
        Yuchung Cheng.
    
     7) Fix off by one in bluetooth firmward parsing, from Dan Carpenter.
    
     8) Fix extended frame handling in xiling_can driver, from Jeppe
        Ledet-Pedersen.
    
     9) Fix CODEL packet scheduler behavior in the presence of TSO packets,
        from Eric Dumazet.
    
    10) Fix NAPI budget testing in fm10k driver, from Alexander Duyck.
    
    11) macvlan needs to propagate promisc settings down the the lower
        device, from Vlad Yasevich.
    
    12) igb driver can oops when changing number of rings, from Toshiaki
        Makita.
    
    13) Source specific default routes not handled properly in ipv6, from
        Markus Stenberg.
    
    14) Use after free in tc_ctl_tfilter(), from WANG Cong.
    
    15) Use softirq spinlocking in netxen driver, from Tony Camuso.
    
    16) Two ARM bpf JIT fixes from Nicolas Schichan.
    
    17) Handle MSG_DONTWAIT properly in ring based AF_PACKET sends, from
        Mathias Kretschmer.
    
    18) Fix x86 bpf JIT implementation of FROM_{BE16,LE16,LE32}, from Alexei
        Starovoitov.
    
    19) ll_temac driver DMA maps TX packet header with incorrect length, fix
        from Michal Simek.
    
    20) We removed pm_qos bits from netdevice.h, but some indirect
        references remained.  Kill them.  From David Ahern.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (90 commits)
      net: Remove remaining remnants of pm_qos from netdevice.h
      e1000e: Add pm_qos header
      net: phy: micrel: Fix regression in kszphy_probe
      net: ll_temac: Fix DMA map size bug
      x86: bpf_jit: fix FROM_BE16 and FROM_LE16/32 instructions
      netns: return RTM_NEWNSID instead of RTM_GETNSID on a get
      Update be2net maintainers' email addresses
      net_sched: gred: use correct backlog value in WRED mode
      pppoe: drop pppoe device in pppoe_unbind_sock_work
      net: qca_spi: Fix possible race during probe
      net: mdio-gpio: Allow for unspecified bus id
      af_packet / TX_RING not fully non-blocking (w/ MSG_DONTWAIT).
      bnx2x: limit fw delay in kdump to 5s after boot
      ARM: net: delegate filter to kernel interpreter when imm_offset() return value can't fit into 12bits.
      ARM: net fix emit_udiv() for BPF_ALU | BPF_DIV | BPF_K intruction.
      mpls: Change reserved label names to be consistent with netbsd
      usbnet: avoid integer overflow in start_xmit
      netxen_nic: use spin_[un]lock_bh around tx_clean_lock (2)
      net: xgene_enet: Set hardware dependency
      net: amd-xgbe: Add hardware dependency
      ...