diff options
author | Patrick McHardy <kaber@trash.net> | 2014-01-16 20:39:20 +0000 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2014-01-16 20:39:20 +0000 |
commit | 807b936bb3d9bb2c924c742a0548337089494968 (patch) | |
tree | 61198b487730ad1b434db66ec2f1e002b66d18c2 /src/mnl.c | |
parent | 0dbced3615ffdbb212ba4f791475a7c65a525309 (diff) | |
parent | bea7aab38f305bb8c2e400d575e6bd0a3c6bbc1f (diff) |
Merge remote-tracking branch 'origin/master' into next-3.14
Signed-off-by: Patrick McHardy <kaber@trash.net>
Conflicts:
include/nftables.h
src/main.c
Diffstat (limited to 'src/mnl.c')
-rw-r--r-- | src/mnl.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -39,7 +39,7 @@ mnl_talk(struct mnl_socket *nf_sock, const void *data, unsigned int len, int ret; #ifdef DEBUG - if (debug_level & DEBUG_NETLINK) + if (debug_level & DEBUG_MNL) mnl_nlmsg_fprintf(stdout, data, len, sizeof(struct nfgenmsg)); #endif @@ -207,7 +207,7 @@ static ssize_t mnl_nft_socket_sendmsg(const struct mnl_socket *nl) iov[i].iov_len = mnl_nlmsg_batch_size(batch_page->batch); i++; #ifdef DEBUG - if (debug_level & DEBUG_NETLINK) { + if (debug_level & DEBUG_MNL) { mnl_nlmsg_fprintf(stdout, mnl_nlmsg_batch_head(batch_page->batch), mnl_nlmsg_batch_size(batch_page->batch), |