aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/sgi-xp
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-28 15:49:40 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-28 15:49:40 -0500
commit0191b625ca5a46206d2fb862bb08f36f2fcb3b31 (patch)
tree454d1842b1833d976da62abcbd5c47521ebe9bd7 /drivers/misc/sgi-xp
parent54a696bd07c14d3b1192d03ce7269bc59b45209a (diff)
parenteb56092fc168bf5af199d47af50c0d84a96db898 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits) net: Allow dependancies of FDDI & Tokenring to be modular. igb: Fix build warning when DCA is disabled. net: Fix warning fallout from recent NAPI interface changes. gro: Fix potential use after free sfc: If AN is enabled, always read speed/duplex from the AN advertising bits sfc: When disabling the NIC, close the device rather than unregistering it sfc: SFT9001: Add cable diagnostics sfc: Add support for multiple PHY self-tests sfc: Merge top-level functions for self-tests sfc: Clean up PHY mode management in loopback self-test sfc: Fix unreliable link detection in some loopback modes sfc: Generate unique names for per-NIC workqueues 802.3ad: use standard ethhdr instead of ad_header 802.3ad: generalize out mac address initializer 802.3ad: initialize ports LACPDU from const initializer 802.3ad: remove typedef around ad_system 802.3ad: turn ports is_individual into a bool 802.3ad: turn ports is_enabled into a bool 802.3ad: make ntt bool ixgbe: Fix set_ringparam in ixgbe to use the same memory pools. ... Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due to the conversion to %pI (in this networking merge) and the addition of doing IPv6 addresses (from the earlier merge of CIFS).
Diffstat (limited to 'drivers/misc/sgi-xp')
-rw-r--r--drivers/misc/sgi-xp/xpnet.c13
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)
368static struct net_device_stats * 367static struct net_device_stats *
369xpnet_dev_get_stats(struct net_device *dev) 368xpnet_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)
541static void 538static void
542xpnet_dev_tx_timeout(struct net_device *dev) 539xpnet_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;