1. 01 Feb, 2017 2 commits
    • Theuns Verwoerd's avatar
      rtnetlink: Handle IFLA_MASTER parameter when processing rtnl_newlink · 160ca014
      Theuns Verwoerd authored
      Allow a master interface to be specified as one of the parameters when
      creating a new interface via rtnl_newlink.  Previously this would
      require invoking interface creation, waiting for it to complete, and
      then separately binding that new interface to a master.
      
      In particular, this is used when creating a macvlan child interface for
      VRRP in a VRF configuration, allowing the interface creator to specify
      directly what master interface should be inherited by the child,
      without having to deal with asynchronous complications and potential
      race conditions.
      Signed-off-by: default avatarTheuns Verwoerd <theuns.verwoerd@alliedtelesis.co.nz>
      Acked-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      160ca014
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next · 04cdf13e
      David S. Miller authored
      Steffen Klassert says:
      
      ====================
      pull request (net-next): ipsec-next 2017-02-01
      
      1) Some typo fixes, from Alexander Alemayhu.
      
      2) Don't acquire state lock in get_mtu functions.
         The only rece against a dead state does not matter.
         From Florian Westphal.
      
      3) Remove xfrm4_state_fini, it is unused for more than
         10 years. From Florian Westphal.
      
      4) Various rcu usage improvements. From Florian Westphal.
      
      5) Properly handle crypto arrors in ah4/ah6.
         From Gilad Ben-Yossef.
      
      6) Try to avoid skb linearization in esp4 and esp6.
      
      7) The esp trailer is now set up in different places,
         add a helper for this.
      
      8) With the upcomming usage of gro_cells in IPsec,
         a gro merged skb can have a secpath. Drop it
         before freeing or reusing the skb.
      
      9) Add a xfrm dummy network device for napi. With
         this we can use gro_cells from within xfrm,
         it allows IPsec GRO without impact on the generic
         networking code.
      
      Please pull or let me know if there are problems.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      04cdf13e
  2. 31 Jan, 2017 13 commits
  3. 30 Jan, 2017 25 commits