diff options
| author | Patrick McHardy <kaber@trash.net> | 2014-01-09 18:55:50 +0000 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2014-01-09 18:55:50 +0000 |
| commit | 01cd6fa3cce3517f92a16151d94e4ce35542e88c (patch) | |
| tree | cd78851d10e3f409c297c9b7710d9c5492de3357 /include | |
| parent | 87787ee86ec95a8a5494615268a03a756f48433f (diff) | |
| parent | f930cc50031851c6975058e33408214ad0c240b6 (diff) | |
Merge remote-tracking branch 'origin/master' into next-3.14
Diffstat (limited to 'include')
| -rw-r--r-- | include/mnl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mnl.h b/include/mnl.h index fe2fb400..a6306058 100644 --- a/include/mnl.h +++ b/include/mnl.h @@ -18,7 +18,7 @@ void mnl_err_list_free(struct mnl_err *err); void mnl_batch_init(void); bool mnl_batch_ready(void); void mnl_batch_reset(void); -void mnl_batch_begin(void); +uint32_t mnl_batch_begin(void); void mnl_batch_end(void); int mnl_batch_talk(struct mnl_socket *nl, struct list_head *err_list); int mnl_nft_rule_batch_add(struct nft_rule *nlr, unsigned int flags, |