summaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_vti.c
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-05-241-4/+4
|\
| * vti: Use the tunnel mark for lookup in the error handlers.Steffen Klassert2014-05-121-1/+4
| * vti6: Don't unregister pernet ops twice on init errorsMathias Krause2014-05-121-3/+0
* | vti6: delete unneeded call to netdev_privJulia Lawall2014-05-151-3/+0
|/
* vti6: Enable namespace changingSteffen Klassert2014-03-141-1/+0
* vti6: Check the tunnel endpoints of the xfrm state and the vti interfaceSteffen Klassert2014-03-141-1/+24
* vti6: Support inter address family tunneling.Steffen Klassert2014-03-141-15/+34
* vti6: Update the ipv6 side to use its own receive hook.Steffen Klassert2014-03-141-27/+149
* vti6: Remove caching of flow informations.Steffen Klassert2014-03-141-31/+0
* vti6: Remove dst_entry cachingSteffen Klassert2014-03-141-24/+18
* net: introduce netdev_alloc_pcpu_stats() for driversWANG Cong2014-02-141-7/+1
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-01-141-0/+6
|\
| * ipv6: pcpu_tstats.syncp should be initialised in ip6_vti.cLi RongQing2014-01-071-0/+6
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-01-061-22/+3
|\|
| * ipv6: fix the use of pcpu_tstats in ip6_vti.cLi RongQing2014-01-021-21/+3
* | net: unify the pcpu_tstats and br_cpu_netstats as oneLi RongQing2014-01-041-5/+5
|/
* ipv6: Add support for IPsec virtual tunnel interfacesSteffen Klassert2013-10-101-0/+1056