summaryrefslogtreecommitdiff
path: root/dissector.h
AgeCommit message (Expand)AuthorFilesLines
2013-06-17dissector: explicitly init arrayDaniel Borkmann1-10/+9
2013-06-04xutils: eliminate xutils, move rest to epoll2Daniel Borkmann1-0/+2
2013-05-31ring: netsniff-ng: migrate capture only to TPACKET_V3Daniel Borkmann1-9/+20
2013-04-29dissector: show sw/hw timestamp sourceDaniel Borkmann1-2/+16
2013-03-15all: import netsniff-ng 0.5.8-rc0 sourceDaniel Borkmann1-0/+64
x/net-next.git/commit/net/rds/rdma.c?h=nds-private-remove&id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch) treef4abe2f05e173023d2a262afd4aebb1e89fe6985 /net/rds/rdma.c parent76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (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/rds/rdma.c')