1. 07 Oct, 2013 2 commits
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next · 7009deab
      David S. Miller authored
      Conflicts:
      	drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
      	drivers/net/wireless/rtlwifi/rtl8188ee/phy.h
      	drivers/net/wireless/rtlwifi/rtl8192ce/phy.h
      	drivers/net/wireless/rtlwifi/rtl8192de/phy.h
      	drivers/net/wireless/rtlwifi/rtl8723ae/phy.h
      
      Just some minor conflicts between the wireless-next changes
      and Joe Perches's "extern" removal from function prototypes
      in header files.
      
      John W. Linville says:
      
      ====================
      Regarding the Bluetooth bits, Gustavo says:
      
      "The big work here is from Marcel and Johan. They did a lot of work
      in the L2CAP, HCI and MGMT layers. The most important ones are the
      addition of a new MGMT command to enable/disable LE advertisement
      and the introduction of the HCI user channel to allow applications
      to get directly and exclusive access to Bluetooth devices."
      
      As to the ath10k bits, Kalle says:
      
      "Bartosz dropped support for qca98xx hw1.0 hardware from ath10k, it's
      just too much to support it. Michal added support for the new firmware
      interface. Marek fixed WEP in AP and IBSS mode. Rest of the changes are
      minor fixes or cleanups."
      
      And also:
      
      "Major changes are:
      
      * throughput improvements including aligning the RX frames correctly and
        optimising HTT layer (Michal)
      
      * remove qca98xx hw1.0 support (Bartosz)
      
      * add support for firmware version 999.999.0.636 (Michal)
      
      * firmware htt statistics support (Kalle)
      
      * fix WEP in AP and IBSS mode (Marek)
      
      * fix a mutex unlock balance in debugfs file (Shafi)
      
      And of course there's a lot of smaller fixes and cleanup."
      
      For the wl12xx bits, Luca says:
      
      "Here are some patches intended for 3.13.  Eliad is upstreaming a bunch
      of patches that have been pending in the internal tree.  Mostly bugfixes
      and other small improvements."
      
      Along with that...
      
      Arend and friends bring us a batch of brcmfmac updates, Larry Finger
      offers some rtlwifi refactoring, and Sujith sends the usual batch of
      ath9k updates.  As usual, there are a number of other small updates
      from a variety of players as well.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7009deab
    • Eric W. Biederman's avatar
      net: Separate the close_list and the unreg_list v2 · 5cde2829
      Eric W. Biederman authored
      Separate the unreg_list and the close_list in dev_close_many preventing
      dev_close_many from permuting the unreg_list.  The permutations of the
      unreg_list have resulted in cases where the loopback device is accessed
      it has been freed in code such as dst_ifdown.  Resulting in subtle memory
      corruption.
      
      This is the second bug from sharing the storage between the close_list
      and the unreg_list.  The issues that crop up with sharing are
      apparently too subtle to show up in normal testing or usage, so let's
      forget about being clever and use two separate lists.
      
      v2: Make all callers pass in a close_list to dev_close_many
      Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5cde2829
  2. 04 Oct, 2013 1 commit
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · d639feaa
      David S. Miller authored
      Pablo Neira Ayuso says:
      
      ====================
      The following patchset contains Netfilter updates for your net-next tree,
      mostly ipset improvements and enhancements features, they are:
      
      * Don't call ip_nest_end needlessly in the error path from me, suggested
        by Pablo Neira Ayuso, from Jozsef Kadlecsik.
      
      * Fixed sparse warnings about shadowed variable and missing rcu annotation
        and fix of "may be used uninitialized" warnings, also from Jozsef.
      
      * Renamed simple macro names to avoid namespace issues, reported by David
        Laight, again from Jozsef.
      
      * Use fix sized type for timeout in the extension part, and cosmetic
        ordering of matches and targets separatedly in xt_set.c, from Jozsef.
      
      * Support package fragments for IPv4 protos without ports from Anders K.
        Pedersen. For example this allows a hash:ip,port ipset containing the
        entry 192.168.0.1,gre:0 to match all package fragments for PPTP VPN
        tunnels to/from the host. Without this patch only the first package
        fragment (with fragment offset 0) was matched.
      
      * Introduced a new operation to get both setname and family, from Jozsef.
        ip[6]tables set match and SET target need to know the family of the set
        in order to reject adding rules which refer to a set with a non-mathcing
        family. Currently such rules are silently accepted and then ignored
        instead of generating an error message to the user.
      
      * Reworked extensions support in ipset types from Jozsef. The approach of
        defining structures with all variations is not manageable as the
        number of extensions grows. Therefore a blob for the extensions is
        introduced, somewhat similar to conntrack. The support of extensions
        which need a per data destroy function is added as well.
      
      * When an element timed out in a list:set type of set, the garbage
        collector skipped the checking of the next element. So the purging
        was delayed to the next run of the gc, fixed by Jozsef.
      
      * A small Kconfig fix: NETFILTER_NETLINK cannot be selected and
        ipset requires it.
      
      * hash:net,net type from Oliver Smith. The type provides the ability to
        store pairs of subnets in a set.
      
      * Comment for ipset entries from Oliver Smith. This makes possible to
        annotate entries in a set with comments, for example:
      
        ipset n foo hash:net,net comment
        ipset a foo 10.0.0.0/21,192.168.1.0/24 comment "office nets A and B"
      
      * Fix of hash types resizing with comment extension from Jozsef.
      
      * Fix of new extensions for list:set type when an element is added
        into a slot from where another element was pushed away from Jozsef.
      
      * Introduction of a common function for the listing of the element
        extensions from Jozsef.
      
      * Net namespace support for ipset from Vitaly Lavrov.
      
      * hash:net,port,net type from Oliver Smith, which makes possible
        to store the triples of two subnets and a protocol, port pair in
        a set.
      
      * Get xt_TCPMSS working with net namespace, by Gao feng.
      
      * Use the proper net netnamespace to allocate skbs, also by Gao feng.
      
      * A couple of cleanups for the conntrack SIP helper, by Holger
        Eitzenberger.
      
      * Extend cttimeout to allow setting default conntrack timeouts via
        nfnetlink, so we can get rid of all our sysctl/proc interfaces in
        the future for timeout tuning, from me.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d639feaa
  3. 03 Oct, 2013 37 commits