diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2018-05-21 18:45:44 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-05-23 13:18:00 +0000 |
| commit | 675e0649c04d1c55ea570c6f5c9efb90a0f81e6e (patch) | |
| tree | 56d80eb9d780a6374a399cdcc34809afa2415f16 /extcap/dpauxmon.c | |
| parent | 1d2b0d91e3d90062367052c4ac9753a6b78e0fcd (diff) | |
make our version of nla_for_each_nested() public
caputils/ws80211_utils.c contains a re-definition of the linux kernel's
nla_for_each_nested() macro that applies the correct casts to allow
compilation with a C++ compiler.
Make this definition public by moving it into a new wsutil/netlink.h
file. Include the kernel's original definition before we overwrite it. This
way, it's not necessary for a .c file to include wsutil/netlink.h after
the system includes.
Use our nla_for_each_nested() version in extcap/dpauxmon.c to squelch the
following compiler warning:
[1664/2251] Building C object
extcap/CMakeFiles/dpauxmon.dir/dpauxmon.c.o
../extcap/dpauxmon.c: In function ‘family_handler’:
../extcap/dpauxmon.c:168:13: warning: request for implicit conversion
from ‘void *’ to ‘struct nlattr *’ not permitted in C++ [-Wc++-compat]
nla_for_each_nested(mcgrp, tb[CTRL_ATTR_MCAST_GROUPS], rem_mcgrp) {
Change-Id: I6ba40ef6343c5d168c1b0c4554f13202911ded76
Reviewed-on: https://code.wireshark.org/review/27688
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'extcap/dpauxmon.c')
| -rw-r--r-- | extcap/dpauxmon.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/extcap/dpauxmon.c b/extcap/dpauxmon.c index 6cd1ccd35f..b31a216f4f 100644 --- a/extcap/dpauxmon.c +++ b/extcap/dpauxmon.c @@ -16,6 +16,7 @@ #include <wsutil/strtoi.h> #include <wsutil/filesystem.h> +#include <wsutil/netlink.h> #include <writecap/pcapio.h> #include <netlink/netlink.h> |