|
@@ -46,9 +46,16 @@ struct macvlan_port {
|
|
|
|
|
|
static void macvlan_port_destroy(struct net_device *dev);
|
|
|
|
|
|
-#define macvlan_port_get_rcu(dev) \
|
|
|
- ((struct macvlan_port *) rcu_dereference(dev->rx_handler_data))
|
|
|
-#define macvlan_port_get(dev) ((struct macvlan_port *) dev->rx_handler_data)
|
|
|
+static struct macvlan_port *macvlan_port_get_rcu(const struct net_device *dev)
|
|
|
+{
|
|
|
+ return rcu_dereference(dev->rx_handler_data);
|
|
|
+}
|
|
|
+
|
|
|
+static struct macvlan_port *macvlan_port_get_rtnl(const struct net_device *dev)
|
|
|
+{
|
|
|
+ return rtnl_dereference(dev->rx_handler_data);
|
|
|
+}
|
|
|
+
|
|
|
#define macvlan_port_exists(dev) (dev->priv_flags & IFF_MACVLAN_PORT)
|
|
|
|
|
|
static struct macvlan_dev *macvlan_hash_lookup(const struct macvlan_port *port,
|
|
@@ -703,7 +710,7 @@ static int macvlan_port_create(struct net_device *dev)
|
|
|
|
|
|
static void macvlan_port_destroy(struct net_device *dev)
|
|
|
{
|
|
|
- struct macvlan_port *port = macvlan_port_get(dev);
|
|
|
+ struct macvlan_port *port = macvlan_port_get_rtnl(dev);
|
|
|
|
|
|
dev->priv_flags &= ~IFF_MACVLAN_PORT;
|
|
|
netdev_rx_handler_unregister(dev);
|
|
@@ -772,7 +779,7 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev,
|
|
|
if (err < 0)
|
|
|
return err;
|
|
|
}
|
|
|
- port = macvlan_port_get(lowerdev);
|
|
|
+ port = macvlan_port_get_rtnl(lowerdev);
|
|
|
|
|
|
/* Only 1 macvlan device can be created in passthru mode */
|
|
|
if (port->passthru)
|
|
@@ -921,7 +928,7 @@ static int macvlan_device_event(struct notifier_block *unused,
|
|
|
if (!macvlan_port_exists(dev))
|
|
|
return NOTIFY_DONE;
|
|
|
|
|
|
- port = macvlan_port_get(dev);
|
|
|
+ port = macvlan_port_get_rtnl(dev);
|
|
|
|
|
|
switch (event) {
|
|
|
case NETDEV_CHANGE:
|