lkml.org 
[lkml]   [2018]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.16 015/161] net: dsa: Do not register devlink for unused ports
    Date
    4.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Florian Fainelli <f.fainelli@gmail.com>

    [ Upstream commit 5447d78623da2eded06d4cd9469d1a71eba43bc4 ]

    Even if commit 1d27732f411d ("net: dsa: setup and teardown ports") indicated
    that registering a devlink instance for unused ports is not a problem, and this
    is true, this can be confusing nonetheless, so let's not do it.

    Fixes: 1d27732f411d ("net: dsa: setup and teardown ports")
    Reported-by: Jiri Pirko <jiri@resnulli.us>
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/dsa/dsa2.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    --- a/net/dsa/dsa2.c
    +++ b/net/dsa/dsa2.c
    @@ -258,11 +258,13 @@ static void dsa_tree_teardown_default_cp
    static int dsa_port_setup(struct dsa_port *dp)
    {
    struct dsa_switch *ds = dp->ds;
    - int err;
    + int err = 0;

    memset(&dp->devlink_port, 0, sizeof(dp->devlink_port));

    - err = devlink_port_register(ds->devlink, &dp->devlink_port, dp->index);
    + if (dp->type != DSA_PORT_TYPE_UNUSED)
    + err = devlink_port_register(ds->devlink, &dp->devlink_port,
    + dp->index);
    if (err)
    return err;

    @@ -293,7 +295,8 @@ static int dsa_port_setup(struct dsa_por

    static void dsa_port_teardown(struct dsa_port *dp)
    {
    - devlink_port_unregister(&dp->devlink_port);
    + if (dp->type != DSA_PORT_TYPE_UNUSED)
    + devlink_port_unregister(&dp->devlink_port);

    switch (dp->type) {
    case DSA_PORT_TYPE_UNUSED:

    \
     
     \ /
      Last update: 2018-05-24 12:40    [W:4.163 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site