summaryrefslogtreecommitdiff
path: root/net/ipv6/ila
ModeNameSize
-rw-r--r--Makefile110logplain
-rw-r--r--ila.h2428logplain
-rw-r--r--ila_common.c4173logplain
-rw-r--r--ila_lwt.c5958logplain
-rw-r--r--ila_xlat.c14137logplain
amp;id=3efa70d78f218e4c9276b0bac0545e5184c1c47b&id2=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/em_meta.c')