Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 13199a08
    Linus Torvalds authored
    Pull networking changes from David S. Miller:
    
     1) Fix IPSEC header length calculation for transport mode in ESP.  The
        issue is whether to do the calculation before or after alignment.
        Fix from Benjamin Poirier.
    
     2) Fix regression in IPV6 IPSEC fragment length calculations, from Gao
        Feng.  This is another transport vs tunnel mode issue.
    
     3) Handle AF_UNSPEC connect()s properly in L2TP to avoid OOPSes.  Fix
        from James Chapman.
    
     4) Fix USB ASIX driver's reception of full sized VLAN packets, from
        Eric Dumazet.
    
     5) Allow drop monitor (and, more generically, all generic netlink
        protocols) to be automatically loaded as a module.  From Neil
        Horman.
    
    Fix up trivial conflict in Documentation/feature-removal-schedule.txt
    due to new entries added next to each other at the end. As usual.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (38 commits)
      net/smsc911x: Repair broken failure paths
      virtio-net: remove useless disable on freeze
      netdevice: Update netif_dbg for CONFIG_DYNAMIC_DEBUG
      drop_monitor: Add module alias to enable automatic module loading
      genetlink: Build a generic netlink family module alias
      net: add MODULE_ALIAS_NET_PF_PROTO_NAME
      r6040: Do a Proper deinit at errorpath and also when driver unloads (calling r6040_remove_one)
      r6040: disable pci device if the subsequent calls (after pci_enable_device) fails
      skb: avoid unnecessary reallocations in __skb_cow
      net: sh_eth: fix the rxdesc pointer when rx descriptor empty happens
      asix: allow full size 8021Q frames to be received
      rds_rdma: don't assume infiniband device is PCI
      l2tp: fix oops in L2TP IP sockets for connect() AF_UNSPEC case
      mac80211: fix ADDBA declined after suspend with wowlan
      wlcore: fix undefined symbols when CONFIG_PM is not defined
      mac80211: fix flag check for QoS NOACK frames
      ath9k_hw: apply internal regulator settings on AR933x
      ath9k_hw: update AR933x initvals to fix issues with high power devices
      ath9k: fix a use-after-free-bug when ath_tx_setup_buffer() fails
      ath9k: stop rx dma before stopping tx
      ...
    13199a08