diff options
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/sgi-xp/xpnet.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c index 71513b3af708..8e6aa9508f46 100644 --- a/drivers/misc/sgi-xp/xpnet.c +++ b/drivers/misc/sgi-xp/xpnet.c | |||
@@ -153,8 +153,7 @@ xpnet_receive(short partid, int channel, struct xpnet_message *msg) | |||
153 | struct sk_buff *skb; | 153 | struct sk_buff *skb; |
154 | void *dst; | 154 | void *dst; |
155 | enum xp_retval ret; | 155 | enum xp_retval ret; |
156 | struct xpnet_dev_private *priv = | 156 | struct xpnet_dev_private *priv = netdev_priv(xpnet_device); |
157 | (struct xpnet_dev_private *)xpnet_device->priv; | ||
158 | 157 | ||
159 | if (!XPNET_VALID_MSG(msg)) { | 158 | if (!XPNET_VALID_MSG(msg)) { |
160 | /* | 159 | /* |
@@ -368,9 +367,7 @@ xpnet_dev_set_config(struct net_device *dev, struct ifmap *new_map) | |||
368 | static struct net_device_stats * | 367 | static struct net_device_stats * |
369 | xpnet_dev_get_stats(struct net_device *dev) | 368 | xpnet_dev_get_stats(struct net_device *dev) |
370 | { | 369 | { |
371 | struct xpnet_dev_private *priv; | 370 | struct xpnet_dev_private *priv = netdev_priv(dev); |
372 | |||
373 | priv = (struct xpnet_dev_private *)dev->priv; | ||
374 | 371 | ||
375 | return &priv->stats; | 372 | return &priv->stats; |
376 | } | 373 | } |
@@ -456,7 +453,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
456 | struct xpnet_pending_msg *queued_msg; | 453 | struct xpnet_pending_msg *queued_msg; |
457 | u64 start_addr, end_addr; | 454 | u64 start_addr, end_addr; |
458 | short dest_partid; | 455 | short dest_partid; |
459 | struct xpnet_dev_private *priv = (struct xpnet_dev_private *)dev->priv; | 456 | struct xpnet_dev_private *priv = netdev_priv(dev); |
460 | u16 embedded_bytes = 0; | 457 | u16 embedded_bytes = 0; |
461 | 458 | ||
462 | dev_dbg(xpnet, ">skb->head=0x%p skb->data=0x%p skb->tail=0x%p " | 459 | dev_dbg(xpnet, ">skb->head=0x%p skb->data=0x%p skb->tail=0x%p " |
@@ -541,9 +538,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
541 | static void | 538 | static void |
542 | xpnet_dev_tx_timeout(struct net_device *dev) | 539 | xpnet_dev_tx_timeout(struct net_device *dev) |
543 | { | 540 | { |
544 | struct xpnet_dev_private *priv; | 541 | struct xpnet_dev_private *priv = netdev_priv(dev); |
545 | |||
546 | priv = (struct xpnet_dev_private *)dev->priv; | ||
547 | 542 | ||
548 | priv->stats.tx_errors++; | 543 | priv->stats.tx_errors++; |
549 | return; | 544 | return; |