summaryrefslogtreecommitdiff
path: root/ring.c
AgeCommit message (Expand)AuthorFilesLines
2013-12-11trafgen: speedup TX only path by avoiding kernel packet_rcv() callJesper Dangaard Brouer1-2/+5
2013-07-13misc: fix multiple NULL pointer sparse warningsDaniel Borkmann1-1/+1
2013-05-31ring: setup frame structure for v2/v3 in a generic wayDaniel Borkmann1-6/+5
2013-05-31ring: move duplicate/generic code parts from rx/tx into ring.cDaniel Borkmann1-0/+64
bebfb1dc /net parent62e13097c46c69dbd7544ab2cd585ccf48f360a4 (diff)parent6d04dfc8966019b8b0977b2cb942351f13d2b178 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All merge conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/can/af_can.c12
-rw-r--r--net/can/af_can.h3
-rw-r--r--net/can/bcm.c27
-rw-r--r--net/can/gw.c2
-rw-r--r--net/can/raw.c4
-rw-r--r--net/ipv4/tcp_output.c6
-rw-r--r--net/ipv6/ip6_output.c2
-rw-r--r--net/ipv6/ip6_tunnel.c2
-rw-r--r--net/sched/cls_flower.c4
-rw-r--r--net/sched/cls_matchall.c129
-rw-r--r--net/sunrpc/clnt.c5
-rw-r--r--net/sunrpc/sunrpc_syms.c1
12 files changed, 93 insertions, 104 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c