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-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