diff options
author | Thomas Graf <tgraf@suug.ch> | 2011-06-21 11:34:28 +0200 |
---|---|---|
committer | Thomas Graf <tgraf@suug.ch> | 2011-06-21 11:34:28 +0200 |
commit | dba0e91a09dcd928ebc4e8ce4db8cc6cd471d8f9 (patch) | |
tree | 2a15f4a6875051ef5bbbcd51d9d279870eb67a0a /lib/route | |
parent | 4806c5c058ba95b0c88af7731d26dad427d2fcb8 (diff) | |
parent | ca0fc75580512ccb5931fe1e05092c6c52a4e99c (diff) | |
download | libnl-dba0e91a09dcd928ebc4e8ce4db8cc6cd471d8f9.tar.gz |
Merge branch 'master' of master.kernel.org:/pub/scm/libs/netlink/libnl
Diffstat (limited to 'lib/route')
-rw-r--r-- | lib/route/neigh.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/route/neigh.c b/lib/route/neigh.c index 0cd0366..7985d34 100644 --- a/lib/route/neigh.c +++ b/lib/route/neigh.c @@ -465,6 +465,9 @@ static int build_neigh_msg(struct rtnl_neigh *tmpl, int cmd, int flags, nhdr.ndm_family = nl_addr_get_family(tmpl->n_dst); + if (tmpl->ce_mask & NEIGH_ATTR_FLAGS) + nhdr.ndm_flags = tmpl->n_flags; + if (tmpl->ce_mask & NEIGH_ATTR_STATE) nhdr.ndm_state = tmpl->n_state; |