1. 05 Jul, 2012 9 commits
  2. 04 Jul, 2012 1 commit
  3. 02 Jul, 2012 1 commit
  4. 01 Jul, 2012 22 commits
  5. 30 Jun, 2012 4 commits
  6. 29 Jun, 2012 3 commits
    • Pablo Neira Ayuso's avatar
      netlink: add nlk->netlink_bind hook for module auto-loading · 03292745
      Pablo Neira Ayuso authored
      This patch adds a hook in the binding path of netlink.
      
      This is used by ctnetlink to allow module autoloading for the case
      in which one user executes:
      
       conntrack -E
      
      So far, this resulted in nfnetlink loaded, but not
      nf_conntrack_netlink.
      
      I have received in the past many complains on this behaviour.
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      03292745
    • Pablo Neira Ayuso's avatar
      netlink: add netlink_kernel_cfg parameter to netlink_kernel_create · a31f2d17
      Pablo Neira Ayuso authored
      This patch adds the following structure:
      
      struct netlink_kernel_cfg {
              unsigned int    groups;
              void            (*input)(struct sk_buff *skb);
              struct mutex    *cb_mutex;
      };
      
      That can be passed to netlink_kernel_create to set optional configurations
      for netlink kernel sockets.
      
      I've populated this structure by looking for NULL and zero parameters at the
      existing code. The remaining parameters that always need to be set are still
      left in the original interface.
      
      That includes optional parameters for the netlink socket creation. This allows
      easy extensibility of this interface in the future.
      
      This patch also adapts all callers to use this new interface.
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a31f2d17
    • David S. Miller's avatar
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next · dd7f36ba
      David S. Miller authored
      John Linville says:
      
      ====================
      Here is another batch of updates intended for 3.6.  This includes a
      number of pulls, including ones from the mac80211, iwlwifi, ath6kl, and
      wl12xx trees.  I also pulled from the wireless tree to avoid potential
      build conflicts.  There are a number of other patches applied directly,
      including a number for the Broadcom drivers and the mwifiex driver.
      
      The updates cover the usual variety of new hardware support and feature
      enhancements.  It's all good work, but there aren't any big headliners.
      This does resolve a net-next/wireless-next merge conflict reported
      by Stephen.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      dd7f36ba