diff options
| author | Anders Piniesjö <anders.piniesjo@niradynamics.se> | 2022-03-04 10:23:39 (GMT) |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2022-03-04 10:48:29 (GMT) |
| commit | 5d925168a459e841e0bc929af099e9df2e645502 (patch) | |
| tree | cdbd90e3333a81b06196cea331ad27d798951de4 /lib/route | |
| parent | 6fe9418d5ef1097a78fd856f5ebaea8bde5e9396 (diff) | |
| download | libnl-5d925168a459e841e0bc929af099e9df2e645502.zip libnl-5d925168a459e841e0bc929af099e9df2e645502.tar.gz libnl-5d925168a459e841e0bc929af099e9df2e645502.tar.bz2 | |
route: don't use internal bit mask constants in NLA_PUT in can_put_attrs()
[thaller@redhat.com: split original patch and rewrite commit message]
Fixes: 5251188673e4 ('link: basic socket-CAN support')
https://github.com/thom311/libnl/pull/274
Diffstat (limited to 'lib/route')
| -rw-r--r-- | lib/route/link/can.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/route/link/can.c b/lib/route/link/can.c index 3e0631b..8135632 100644 --- a/lib/route/link/can.c +++ b/lib/route/link/can.c @@ -297,26 +297,26 @@ static int can_put_attrs(struct nl_msg *msg, struct rtnl_link *link) return -NLE_MSGSIZE; if (ci->ci_mask & CAN_HAS_RESTART) - NLA_PUT_U32(msg, CAN_HAS_RESTART, ci->ci_restart); + NLA_PUT_U32(msg, IFLA_CAN_RESTART, ci->ci_restart); if (ci->ci_mask & CAN_HAS_RESTART_MS) - NLA_PUT_U32(msg, CAN_HAS_RESTART_MS, ci->ci_restart_ms); + NLA_PUT_U32(msg, IFLA_CAN_RESTART_MS, ci->ci_restart_ms); if (ci->ci_mask & CAN_HAS_CTRLMODE) - NLA_PUT(msg, CAN_HAS_CTRLMODE, sizeof(ci->ci_ctrlmode), + NLA_PUT(msg, IFLA_CAN_CTRLMODE, sizeof(ci->ci_ctrlmode), &ci->ci_ctrlmode); if (ci->ci_mask & CAN_HAS_BITTIMING) - NLA_PUT(msg, CAN_HAS_BITTIMING, sizeof(ci->ci_bittiming), + NLA_PUT(msg, IFLA_CAN_BITTIMING, sizeof(ci->ci_bittiming), &ci->ci_bittiming); if (ci->ci_mask & CAN_HAS_BITTIMING_CONST) - NLA_PUT(msg, CAN_HAS_BITTIMING_CONST, + NLA_PUT(msg, IFLA_CAN_BITTIMING_CONST, sizeof(ci->ci_bittiming_const), &ci->ci_bittiming_const); if (ci->ci_mask & CAN_HAS_CLOCK) - NLA_PUT(msg, CAN_HAS_CLOCK, sizeof(ci->ci_clock), + NLA_PUT(msg, IFLA_CAN_CLOCK, sizeof(ci->ci_clock), &ci->ci_clock); nla_nest_end(msg, data); @@ -483,7 +483,7 @@ int rtnl_link_can_berr(struct rtnl_link *link, struct can_berr_counter *berr) } /** - * Get CAN harware-dependent bit-timing constant + * Get CAN hardware-dependent bit-timing constant * @arg link Link object * @arg bt_const Bit-timing constant * |