1. 02 9月, 2016 22 次提交
  2. 01 9月, 2016 16 次提交
  3. 31 8月, 2016 2 次提交
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf · 2df5d103
      David S. Miller 提交于
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter fixes for net
      
      The following patchset contains Netfilter fixes for your net tree,
      they are:
      
      1) Allow nf_tables reject expression from input, forward and output hooks,
         since only there the routing information is available, otherwise we crash.
      
      2) Fix unsafe list iteration when flushing timeout and accouting objects.
      
      3) Fix refcount leak on timeout policy parsing failure.
      
      4) Unlink timeout object for unconfirmed conntracks too
      
      5) Missing validation of pkttype mangling from bridge family.
      
      6) Fix refcount leak on ebtables on second lookup for the specific
         bridge match extension, this patch from Sabrina Dubroca.
      
      7) Remove unnecessary ip_hdr() in nf_tables_netdev family.
      
      Patches from 1-5 and 7 from Liping Zhang.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2df5d103
    • D
      Merge tag 'mac80211-for-davem-2016-08-30' of... · 15543692
      David S. Miller 提交于
      Merge tag 'mac80211-for-davem-2016-08-30' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
      
      Johannes Berg says:
      
      ====================
      Three little fixes:
       * revert a recent wext patch, which Ben Hutchings noticed was
         wrong, and it turns out not to be necessary for any driver
      
       * fix an infinite loop that can occur under certain conditions
         in mac80211's TDLS code (depending on regulatory information)
      
       * add a cfg80211_get_station() static inline when cfg80211 isn't
         built, to allow other modules to not have to depend on it for it
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      15543692