summaryrefslogtreecommitdiff
path: root/astraceroute
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2014-04-14 22:17:37 +0200
committerTobias Klauser <tklauser@distanz.ch>2014-04-14 22:17:37 +0200
commite70e915c9e7f9418e483b87ae72176e4b2562bb6 (patch)
treef7e21bdd60c500f37f02f993b666e50e9c485d19 /astraceroute
parenta0e49fe80ba94071e4019edc5bbb128e0db1ec35 (diff)
dissector: Get rid of header dependency on pcap_io.h
The dissector only needs the LINKTYPE_* #defines from pcap_io.h. Instead of pulling in this rather large header just for this, move the LINKTYPE_* #defines to an own header and include it where needed. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'astraceroute')
0 files changed, 0 insertions, 0 deletions
private-remove&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 'include/dt-bindings/arm')