summaryrefslogtreecommitdiff
path: root/net/mpls
ModeNameSize
-rw-r--r--Kconfig916logplain
-rw-r--r--Makefile185logplain
-rw-r--r--af_mpls.c40243logplain
-rw-r--r--internal.h3367logplain
-rw-r--r--mpls_gso.c2558logplain
-rw-r--r--mpls_iptunnel.c5723logplain
b8b&id2=54791b276b4000b307339f269d3bf7db877d536f'>diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller: "Several small bug fixes and tidies, along with a fix for non-resumable memory errors triggered by userspace" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc64: Handle PIO & MEM non-resumable errors. sparc64: Zero pages on allocation for mondo and error queues. sparc: Fixed typo in sstate.c. Replaced panicing with panicking sparc: use symbolic names for tsb indexing
Diffstat (limited to 'net/ipv4/xfrm4_protocol.c')