diff options
| -rw-r--r-- | drivers/net/ethernet/rocker/rocker_main.c | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c index 8113b1596075..02602491dba3 100644 --- a/drivers/net/ethernet/rocker/rocker_main.c +++ b/drivers/net/ethernet/rocker/rocker_main.c @@ -262,6 +262,11 @@ static bool rocker_port_is_ovsed(const struct rocker_port *rocker_port) #define ROCKER_OP_FLAG_LEARNED BIT(2) #define ROCKER_OP_FLAG_REFRESH BIT(3) +static bool rocker_flags_nowait(int flags) +{ + return flags & ROCKER_OP_FLAG_NOWAIT; +} + static void *__rocker_mem_alloc(struct switchdev_trans *trans, int flags, size_t size) { @@ -1337,14 +1342,13 @@ typedef int (*rocker_cmd_proc_cb_t)(const struct rocker_port *rocker_port, const struct rocker_desc_info *desc_info, void *priv); -static int rocker_cmd_exec(struct rocker_port *rocker_port, int flags, +static int rocker_cmd_exec(struct rocker_port *rocker_port, bool nowait, rocker_cmd_prep_cb_t prepare, void *prepare_priv, rocker_cmd_proc_cb_t process, void *process_priv) { struct rocker *rocker = rocker_port->rocker; struct rocker_desc_info *desc_info; struct rocker_wait *wait; - bool nowait = !!(flags & ROCKER_OP_FLAG_NOWAIT); unsigned long lock_flags; int err; @@ -1647,7 +1651,7 @@ rocker_cmd_set_port_learning_prep(const struct rocker_port *rocker_port, static int rocker_cmd_get_port_settings_ethtool(struct rocker_port *rocker_port, struct ethtool_cmd *ecmd) { - return rocker_cmd_exec(rocker_port, 0, + return rocker_cmd_exec(rocker_port, false, rocker_cmd_get_port_settings_prep, NULL, rocker_cmd_get_port_settings_ethtool_proc, ecmd); @@ -1656,7 +1660,7 @@ static int rocker_cmd_get_port_settings_ethtool(struct rocker_port *rocker_port, static int rocker_cmd_get_port_settings_macaddr(struct rocker_port *rocker_port, unsigned char *macaddr) { - return rocker_cmd_exec(rocker_port, 0, + return rocker_cmd_exec(rocker_port, false, rocker_cmd_get_port_settings_prep, NULL, rocker_cmd_get_port_settings_macaddr_proc, macaddr); @@ -1665,7 +1669,7 @@ static int rocker_cmd_get_port_settings_macaddr(struct rocker_port *rocker_port, static int rocker_cmd_get_port_settings_mode(struct rocker_port *rocker_port, u8 *p_mode) { - return rocker_cmd_exec(rocker_port, 0, + return rocker_cmd_exec(rocker_port, false, rocker_cmd_get_port_settings_prep, NULL, rocker_cmd_get_port_settings_mode_proc, p_mode); } @@ -1673,7 +1677,7 @@ static int rocker_cmd_get_port_settings_mode(struct rocker_port *rocker_port, static int rocker_cmd_set_port_settings_ethtool(struct rocker_port *rocker_port, struct ethtool_cmd *ecmd) { - return rocker_cmd_exec(rocker_port, 0, + return rocker_cmd_exec(rocker_port, false, rocker_cmd_set_port_settings_ethtool_prep, ecmd, NULL, NULL); } @@ -1681,7 +1685,7 @@ static int rocker_cmd_set_port_settings_ethtool(struct rocker_port *rocker_port, static int rocker_cmd_set_port_settings_macaddr(struct rocker_port *rocker_port, unsigned char *macaddr) { - return rocker_cmd_exec(rocker_port, 0, + return rocker_cmd_exec(rocker_port, false, rocker_cmd_set_port_settings_macaddr_prep, macaddr, NULL, NULL); } @@ -1689,7 +1693,7 @@ static int rocker_cmd_set_port_settings_macaddr(struct rocker_port *rocker_port, static int rocker_cmd_set_port_settings_mtu(struct rocker_port *rocker_port, int mtu) { - return rocker_cmd_exec(rocker_port, 0, + return rocker_cmd_exec(rocker_port, false, rocker_cmd_set_port_settings_mtu_prep, &mtu, NULL, NULL); } @@ -1697,7 +1701,7 @@ static int rocker_cmd_set_port_settings_mtu(struct rocker_port *rocker_port, static int rocker_port_set_learning(struct rocker_port *rocker_port, bool learning) { - return rocker_cmd_exec(rocker_port, 0, + return rocker_cmd_exec(rocker_port, false, rocker_cmd_set_port_learning_prep, &learning, NULL, NULL); } @@ -2575,7 +2579,8 @@ static int rocker_flow_tbl_add(struct rocker_port *rocker_port, spin_unlock_irqrestore(&rocker->flow_tbl_lock, lock_flags); if (!switchdev_trans_ph_prepare(trans)) - return rocker_cmd_exec(rocker_port, flags, + return rocker_cmd_exec(rocker_port, + rocker_flags_nowait(flags), rocker_cmd_flow_tbl_add, found, NULL, NULL); return 0; @@ -2609,7 +2614,8 @@ static int rocker_flow_tbl_del(struct rocker_port *rocker_port, if (found) { if (!switchdev_trans_ph_prepare(trans)) - err = rocker_cmd_exec(rocker_port, flags, + err = rocker_cmd_exec(rocker_port, + rocker_flags_nowait(flags), rocker_cmd_flow_tbl_del, found, NULL, NULL); rocker_kfree(trans, found); @@ -2900,7 +2906,8 @@ static int rocker_group_tbl_add(struct rocker_port *rocker_port, spin_unlock_irqrestore(&rocker->group_tbl_lock, lock_flags); if (!switchdev_trans_ph_prepare(trans)) - return rocker_cmd_exec(rocker_port, flags, + return rocker_cmd_exec(rocker_port, + rocker_flags_nowait(flags), rocker_cmd_group_tbl_add, found, NULL, NULL); return 0; @@ -2931,7 +2938,8 @@ static int rocker_group_tbl_del(struct rocker_port *rocker_port, if (found) { if (!switchdev_trans_ph_prepare(trans)) - err = rocker_cmd_exec(rocker_port, flags, + err = rocker_cmd_exec(rocker_port, + rocker_flags_nowait(flags), rocker_cmd_group_tbl_del, found, NULL, NULL); rocker_group_tbl_entry_free(trans, found); @@ -4409,7 +4417,7 @@ static int rocker_port_get_phys_port_name(struct net_device *dev, struct port_name name = { .buf = buf, .len = len }; int err; - err = rocker_cmd_exec(rocker_port, 0, + err = rocker_cmd_exec(rocker_port, false, rocker_cmd_get_port_settings_prep, NULL, rocker_cmd_get_port_settings_phys_name_proc, &name); @@ -4962,7 +4970,7 @@ rocker_cmd_get_port_stats_ethtool_proc(const struct rocker_port *rocker_port, static int rocker_cmd_get_port_stats_ethtool(struct rocker_port *rocker_port, void *priv) { - return rocker_cmd_exec(rocker_port, 0, + return rocker_cmd_exec(rocker_port, false, rocker_cmd_get_port_stats_prep, NULL, rocker_cmd_get_port_stats_ethtool_proc, priv); |