leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: marvell: prestera: move netdev topology validation to prestera_main

Browse Source 
Move handling of PRECHANGEUPPER event from prestera_switchdev to
prestera_main which is responsible for basic netdev events handling
and routing them to related module.

Signed-off-by: Vadym Kochan <vkochan@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vadym Kochan 2021-06-10 18:43:09 +03:00 committed by David S. Miller
parent 950fd045d7
commit 3d5048cc54
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/net/ethernet/marvell/prestera/prestera_main.c
View File

@ -508,13 +508,36 @@ struct prestera_port *prestera_port_dev_lower_find(struct net_device *dev)
static int prestera_netdev_port_event(struct net_device *dev, static int prestera_netdev_port_event(struct net_device *dev,
unsigned long event, void *ptr) unsigned long event, void *ptr)
{ {
struct netdev_notifier_changeupper_info *info = ptr;
struct netlink_ext_ack *extack;
struct net_device *upper;
extack = netdev_notifier_info_to_extack(&info->info);
upper = info->upper_dev;
switch (event) { switch (event) {
case NETDEV_PRECHANGEUPPER: case NETDEV_PRECHANGEUPPER:
if (!netif_is_bridge_master(upper)) {
NL_SET_ERR_MSG_MOD(extack, "Unknown upper device type");
return -EINVAL;
}
if (!info->linking)
break;
if (netdev_has_any_upper_dev(upper)) {
NL_SET_ERR_MSG_MOD(extack, "Upper device is already enslaved");
return -EINVAL;
}
break;
case NETDEV_CHANGEUPPER: case NETDEV_CHANGEUPPER:
return prestera_bridge_port_event(dev, event, ptr); if (netif_is_bridge_master(upper))
default: return prestera_bridge_port_event(dev, event, ptr);
return 0; break;
} }
return 0;
} }
static int prestera_netdev_event_handler(struct notifier_block *nb, static int prestera_netdev_event_handler(struct notifier_block *nb,

20
drivers/net/ethernet/marvell/prestera/prestera_switchdev.c
View File

@ -537,35 +537,15 @@ int prestera_bridge_port_event(struct net_device *dev, unsigned long event,
void *ptr) void *ptr)
{ {
struct netdev_notifier_changeupper_info *info = ptr; struct netdev_notifier_changeupper_info *info = ptr;
struct netlink_ext_ack *extack;
struct prestera_port *port; struct prestera_port *port;
struct net_device *upper; struct net_device *upper;
int err; int err;
extack = netdev_notifier_info_to_extack(&info->info);
port = netdev_priv(dev); port = netdev_priv(dev);
upper = info->upper_dev; upper = info->upper_dev;
switch (event) { switch (event) {
case NETDEV_PRECHANGEUPPER:
if (!netif_is_bridge_master(upper)) {
NL_SET_ERR_MSG_MOD(extack, "Unknown upper device type");
return -EINVAL;
}
if (!info->linking)
break;
if (netdev_has_any_upper_dev(upper)) {
NL_SET_ERR_MSG_MOD(extack, "Upper device is already enslaved");
return -EINVAL;
}
break;
case NETDEV_CHANGEUPPER: case NETDEV_CHANGEUPPER:
if (!netif_is_bridge_master(upper))
break;
if (info->linking) { if (info->linking) {
err = prestera_port_bridge_join(port, upper); err = prestera_port_bridge_join(port, upper);
if (err) if (err)