Hi Vladimir, On 2/12/21 7:47 PM, Grygorii Strashko wrote: > > > On 12/02/2021 03:05, Vladimir Oltean wrote: >> From: Vladimir Oltean <vladimir.oltean@xxxxxxx> [...] > > Sorry, but we seems just added more work for you. > https://lore.kernel.org/patchwork/cover/1379380/ > Could you squash these when you post new version: Sorry for not noticing earlier. -- >8 -- >From 69f3a1ff1ea0777f5deceefdb0e79ce625e6488a Mon Sep 17 00:00:00 2001 From: Vignesh Raghavendra <vigneshr@xxxxxx> Date: Fri, 12 Feb 2021 19:34:46 +0530 Subject: [PATCH 1/2] fixup! net: switchdev: propagate extack to port attributes --- drivers/net/ethernet/ti/am65-cpsw-switchdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-switchdev.c b/drivers/net/ethernet/ti/am65-cpsw-switchdev.c index 1067e7772dbf..314825acf0a0 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-switchdev.c +++ b/drivers/net/ethernet/ti/am65-cpsw-switchdev.c @@ -81,7 +81,8 @@ static int am65_cpsw_port_attr_br_flags_pre_set(struct net_device *netdev, } static int am65_cpsw_port_attr_set(struct net_device *ndev, - const struct switchdev_attr *attr) + const struct switchdev_attr *attr, + struct netlink_ext_ack *extack) { struct am65_cpsw_port *port = am65_ndev_to_port(ndev); int ret; -- >8 -- >From 7d7fdb79a8b255a1e9fe5d205b0ff1824a16ce56 Mon Sep 17 00:00:00 2001 From: Vignesh Raghavendra <vigneshr@xxxxxx> Date: Fri, 12 Feb 2021 19:40:48 +0530 Subject: [PATCH 2/2] fixup! net: switchdev: pass flags and mask to both {PRE_,}BRIDGE_FLAGS attributes --- drivers/net/ethernet/ti/am65-cpsw-switchdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-switchdev.c b/drivers/net/ethernet/ti/am65-cpsw-switchdev.c index 314825acf0a0..03c7a012f5c5 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-switchdev.c +++ b/drivers/net/ethernet/ti/am65-cpsw-switchdev.c @@ -55,12 +55,12 @@ static int am65_cpsw_port_stp_state_set(struct am65_cpsw_port *port, u8 state) static int am65_cpsw_port_attr_br_flags_set(struct am65_cpsw_port *port, struct net_device *orig_dev, - unsigned long brport_flags) + struct switchdev_brport_flags flags) { struct am65_cpsw_common *cpsw = port->common; bool unreg_mcast_add = false; - if (brport_flags & BR_MCAST_FLOOD) + if (flags.mask & BR_MCAST_FLOOD) unreg_mcast_add = true; netdev_dbg(port->ndev, "BR_MCAST_FLOOD: %d port %u\n", unreg_mcast_add, port->port_id); @@ -72,9 +72,9 @@ static int am65_cpsw_port_attr_br_flags_set(struct am65_cpsw_port *port, } static int am65_cpsw_port_attr_br_flags_pre_set(struct net_device *netdev, - unsigned long flags) + struct switchdev_brport_flags flags) { - if (flags & ~(BR_LEARNING | BR_MCAST_FLOOD)) + if (flags.mask & ~(BR_LEARNING | BR_MCAST_FLOOD)) return -EINVAL; return 0; -- 2.30.0
