summaryrefslogtreecommitdiff
path: root/dissector_netlink.c
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2015-10-19 17:18:23 +0200
committerTobias Klauser <tklauser@distanz.ch>2015-10-19 17:18:23 +0200
commit83e0c196b189513318093a6bf94f783c95e37b4f (patch)
tree1b9b7755098ba6b9b23e081255542a1c48095f3c /dissector_netlink.c
parent67fc4a906aa73700ce84edaceb7fee189ba3771f (diff)
netsniff-ng: proto: Make raw hex/ascii print function globally available
Allow other dissectors to access the hex/ascii printing functions with a raw uint8_t* instead of only through struct pkt_buff. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'dissector_netlink.c')
0 files changed, 0 insertions, 0 deletions
x/net-next.git/diff/net/nfc/nci/uart.c?h=nds-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 'net/nfc/nci/uart.c')