From 6c568a17d2bdb425c802c956529ae93bb13fa928 Mon Sep 17 00:00:00 2001 From: David Kilroy Date: Sat, 17 Apr 2010 17:04:49 +0100 Subject: [PATCH] orinoco_usb: fixup navigation from net_device to orinoco_priv Signed-off-by: David Kilroy --- drivers/net/wireless/orinoco/orinoco_usb.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c index bfd4770..aa94fd3 100644 --- a/drivers/net/wireless/orinoco/orinoco_usb.c +++ b/drivers/net/wireless/orinoco/orinoco_usb.c @@ -413,7 +413,7 @@ static void ezusb_ctx_complete(struct request_context *ctx) if ((ctx->out_rid == EZUSB_RID_TX) && upriv->dev) { struct net_device *dev = upriv->dev; - struct orinoco_private *priv = netdev_priv(dev); + struct orinoco_private *priv = ndev_priv(dev); struct net_device_stats *stats = &priv->stats; if (ctx->state != EZUSB_CTX_COMPLETE) @@ -1077,8 +1077,7 @@ static int ezusb_bap_pread(struct hermes *hw, int bap, static netdev_tx_t ezusb_xmit(struct sk_buff *skb, struct net_device *dev) { - struct orinoco_private *priv = - (struct orinoco_private *) netdev_priv(dev); + struct orinoco_private *priv = ndev_priv(dev); struct net_device_stats *stats = &priv->stats; struct ezusb_priv *upriv = priv->card; int err = 0; @@ -1328,7 +1327,7 @@ static void ezusb_bulk_in_callback(struct urb *urb) ezusb_request_in_callback(upriv, urb); } else if (upriv->dev) { struct net_device *dev = upriv->dev; - struct orinoco_private *priv = netdev_priv(dev); + struct orinoco_private *priv = ndev_priv(dev); hermes_t *hw = &priv->hw; if (hermes_rid == EZUSB_RID_RX) { @@ -1403,7 +1402,7 @@ static inline void ezusb_delete(struct ezusb_priv *upriv) if (upriv->read_urb != NULL) usb_free_urb(upriv->read_urb); if (upriv->dev) { - struct orinoco_private *priv = netdev_priv(upriv->dev); + struct orinoco_private *priv = ndev_priv(upriv->dev); orinoco_if_del(priv); free_orinocodev(priv); } -- 2.11.4.GIT