diff options
Diffstat (limited to 'drivers/net/vxge/vxge-ethtool.c')
-rw-r--r-- | drivers/net/vxge/vxge-ethtool.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/vxge/vxge-ethtool.c b/drivers/net/vxge/vxge-ethtool.c index c6736b972635..cadef8549c06 100644 --- a/drivers/net/vxge/vxge-ethtool.c +++ b/drivers/net/vxge/vxge-ethtool.c | |||
@@ -12,6 +12,7 @@ | |||
12 | * Copyright(c) 2002-2009 Neterion Inc. | 12 | * Copyright(c) 2002-2009 Neterion Inc. |
13 | ******************************************************************************/ | 13 | ******************************************************************************/ |
14 | #include<linux/ethtool.h> | 14 | #include<linux/ethtool.h> |
15 | #include <linux/slab.h> | ||
15 | #include <linux/pci.h> | 16 | #include <linux/pci.h> |
16 | #include <linux/etherdevice.h> | 17 | #include <linux/etherdevice.h> |
17 | 18 | ||
@@ -108,7 +109,7 @@ static void vxge_ethtool_gregs(struct net_device *dev, | |||
108 | int index, offset; | 109 | int index, offset; |
109 | enum vxge_hw_status status; | 110 | enum vxge_hw_status status; |
110 | u64 reg; | 111 | u64 reg; |
111 | u8 *reg_space = (u8 *) space; | 112 | u64 *reg_space = (u64 *) space; |
112 | struct vxgedev *vdev = (struct vxgedev *)netdev_priv(dev); | 113 | struct vxgedev *vdev = (struct vxgedev *)netdev_priv(dev); |
113 | struct __vxge_hw_device *hldev = (struct __vxge_hw_device *) | 114 | struct __vxge_hw_device *hldev = (struct __vxge_hw_device *) |
114 | pci_get_drvdata(vdev->pdev); | 115 | pci_get_drvdata(vdev->pdev); |
@@ -128,8 +129,7 @@ static void vxge_ethtool_gregs(struct net_device *dev, | |||
128 | __func__, __LINE__); | 129 | __func__, __LINE__); |
129 | return; | 130 | return; |
130 | } | 131 | } |
131 | 132 | *reg_space++ = reg; | |
132 | memcpy((reg_space + offset), ®, 8); | ||
133 | } | 133 | } |
134 | } | 134 | } |
135 | } | 135 | } |