lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 262/779] can: netlink: allow configuring of fixed bit rates without need for do_set_bittiming callback
    Date
    From: Marc Kleine-Budde <mkl@pengutronix.de>

    [ Upstream commit 7e193a42c37cf40eba8ac5af2d5e8eeb8b9506f9 ]

    Usually CAN devices support configurable bit rates. The limits are
    defined by struct can_priv::bittiming_const. Another way is to
    implement the struct can_priv::do_set_bittiming callback.

    If the bit rate is configured via netlink, the can_changelink()
    function checks that either can_priv::bittiming_const or struct
    can_priv::do_set_bittiming is implemented.

    In commit 431af779256c ("can: dev: add CAN interface API for fixed
    bitrates") an API for configuring bit rates on CAN interfaces that
    only support fixed bit rates was added. The supported bit rates are
    defined by struct can_priv::bitrate_const.

    However the above mentioned commit forgot to add the struct
    can_priv::bitrate_const to the check in can_changelink().

    In order to avoid to implement a no-op can_priv::do_set_bittiming
    callback on devices with fixed bit rates, extend the check in
    can_changelink() accordingly.

    Link: https://lore.kernel.org/all/20220611144248.3924903-1-mkl@pengutronix.de
    Fixes: 431af779256c ("can: dev: add CAN interface API for fixed bitrates")
    Reported-by: Max Staudt <max@enpas.org>
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/can/dev/netlink.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/can/dev/netlink.c b/drivers/net/can/dev/netlink.c
    index 80425636049d..cdde7fecefcf 100644
    --- a/drivers/net/can/dev/netlink.c
    +++ b/drivers/net/can/dev/netlink.c
    @@ -76,7 +76,8 @@ static int can_changelink(struct net_device *dev, struct nlattr *tb[],
    * directly via do_set_bitrate(). Bail out if neither
    * is given.
    */
    - if (!priv->bittiming_const && !priv->do_set_bittiming)
    + if (!priv->bittiming_const && !priv->do_set_bittiming &&
    + !priv->bitrate_const)
    return -EOPNOTSUPP;

    memcpy(&bt, nla_data(data[IFLA_CAN_BITTIMING]), sizeof(bt));
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-15 20:53    [W:4.041 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site