This patch breaks out common netdev routines that allow a device to pass venetdev pointer as opposed to assuming it is the priv member of the netdevice.
Signed-off-by: Patrick Mullaney <[email protected]> --- kernel/vbus/devices/venet/device.c | 43 ++++++++++++++++++++++++++----- kernel/vbus/devices/venet/venetdevice.h | 5 ++++ 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/kernel/vbus/devices/venet/device.c b/kernel/vbus/devices/venet/device.c index d49ba7f..9fd94ca 100644 --- a/kernel/vbus/devices/venet/device.c +++ b/kernel/vbus/devices/venet/device.c @@ -228,9 +228,8 @@ venetdev_txq_notify_dec(struct venetdev *priv) */ int -venetdev_netdev_open(struct net_device *dev) +venetdev_open(struct venetdev *priv) { - struct venetdev *priv = netdev_priv(dev); unsigned long flags; BUG_ON(priv->netif.link); @@ -260,7 +259,7 @@ venetdev_netdev_open(struct net_device *dev) priv->netif.link = true; if (!priv->vbus.link) - netif_carrier_off(dev); + netif_carrier_off(priv->netif.dev); spin_unlock_irqrestore(&priv->lock, flags); @@ -268,9 +267,16 @@ venetdev_netdev_open(struct net_device *dev) } int -venetdev_netdev_stop(struct net_device *dev) +venetdev_netdev_open(struct net_device *dev) { struct venetdev *priv = netdev_priv(dev); + + return venetdev_open(priv); +} + +int +venetdev_stop(struct venetdev *priv) +{ unsigned long flags; int needs_stop = false; @@ -296,6 +302,14 @@ venetdev_netdev_stop(struct net_device *dev) return 0; } +int +venetdev_netdev_stop(struct net_device *dev) +{ + struct venetdev *priv = netdev_priv(dev); + + return venetdev_stop(priv); +} + /* * Configuration changes (passed on by ifconfig) */ @@ -1541,10 +1555,10 @@ venetdev_apply_backpressure(struct venetdev *priv) * the netif flow control is still managed by the actual consumer, * thereby avoiding the creation of an extra servo-loop to the equation. */ + int -venetdev_netdev_tx(struct sk_buff *skb, struct net_device *dev) +venetdev_xmit(struct sk_buff *skb, struct venetdev *priv) { - struct venetdev *priv = netdev_priv(dev); struct ioq *ioq = NULL; unsigned long flags; @@ -1585,6 +1599,15 @@ flowcontrol: return NETDEV_TX_BUSY; } +int +venetdev_netdev_tx(struct sk_buff *skb, struct net_device *dev) +{ + struct venetdev *priv = netdev_priv(dev); + + return venetdev_xmit(skb, priv); +} + + /* * Ioctl commands */ @@ -1599,10 +1622,16 @@ venetdev_netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) * Return statistics to the caller */ struct net_device_stats * +venetdev_get_stats(struct venetdev *priv) +{ + return &priv->netif.stats; +} + +struct net_device_stats * venetdev_netdev_stats(struct net_device *dev) { struct venetdev *priv = netdev_priv(dev); - return &priv->netif.stats; + return venetdev_get_stats(priv); } /* diff --git a/kernel/vbus/devices/venet/venetdevice.h b/kernel/vbus/devices/venet/venetdevice.h index 9a60a2e..71c9f0f 100644 --- a/kernel/vbus/devices/venet/venetdevice.h +++ b/kernel/vbus/devices/venet/venetdevice.h @@ -142,6 +142,11 @@ int venetdev_netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); struct net_device_stats *venetdev_netdev_stats(struct net_device *dev); +int venetdev_open(struct venetdev *dev); +int venetdev_stop(struct venetdev *dev); +int venetdev_xmit(struct sk_buff *skb, struct venetdev *dev); +struct net_device_stats *venetdev_get_stats(struct venetdev *dev); + static inline void venetdev_netdev_unregister(struct venetdev *priv) { if (priv->netif.enabled) { _______________________________________________ Bridge mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/bridge
