summaryrefslogtreecommitdiff
path: root/timer.h
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2015-04-27 18:21:28 +0200
committerTobias Klauser <tklauser@distanz.ch>2015-04-27 18:21:28 +0200
commit38fbb82405aa00315bb3a5e380ea34a28f5b9de7 (patch)
treeb48804d073aee4b829f67a8825dc3acb5fc1a3ff /timer.h
parent613be40b15d8e645a188a003b2b125b2e3aced8b (diff)
netsniff-ng: nlmsg: Rename function and dissector field
Netlink messages don't use the term `family' instead of `protocol', so stick to it when printing dissected information. Also, functions with the `nl_' prefix are used by libnl, so in order to not confuse it with libnl functions, rename nl_proto2str() to nlmsg_family2str() Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'timer.h')
0 files changed, 0 insertions, 0 deletions
private-remove&id=a3683e0c1410c5c8136a7a93b0336ce88d3b893a&id2=5d03a2fd2292e71936c4235885c35ccc3c94695b'>diff)
Merge tag 'usb-serial-4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes: USB-serial fixes for v4.10-rc6 Just a couple of new device ids. Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/common')