[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20150413104800.GB2090@nanopsycho.lan>
Date: Mon, 13 Apr 2015 12:48:00 +0200
From: Jiri Pirko <jiri@...nulli.us>
To: sfeldma@...il.com
Cc: netdev@...r.kernel.org, roopa@...ulusnetworks.com,
linux@...ck-us.net, f.fainelli@...il.com,
sridhar.samudrala@...el.com, ronen.arad@...el.com, andrew@...n.ch
Subject: Re: [PATCH net-next v4 05/24] rocker: use swdev get/set attr for
bridge port flags
Mon, Apr 13, 2015 at 08:16:59AM CEST, sfeldma@...il.com wrote:
>From: Scott Feldman <sfeldma@...il.com>
>
>Signed-off-by: Scott Feldman <sfeldma@...il.com>
>---
> drivers/net/ethernet/rocker/rocker.c | 31 +++++++++++++++++++++++++++++--
> 1 file changed, 29 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
>index 80c7f6f..9bd4fc6 100644
>--- a/drivers/net/ethernet/rocker/rocker.c
>+++ b/drivers/net/ethernet/rocker/rocker.c
>@@ -359,6 +359,8 @@ static void *__rocker_port_alloc(struct rocker_port *rocker_port,
> if (elem)
> INIT_LIST_HEAD(elem);
> break;
>+ default:
>+ break;
> }
>
> return elem ? elem + 1 : NULL;
>@@ -4332,6 +4334,9 @@ static int rocker_port_attr_get(struct net_device *dev, struct swdev_attr *attr)
> attr->ppid.id_len = sizeof(rocker->hw.id);
> memcpy(&attr->ppid.id, &rocker->hw.id, attr->ppid.id_len);
> break;
>+ case SWDEV_ATTR_PORT_BRIDGE_FLAGS:
This patch should be squashed with the previous one (04)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists