projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: add external loopback test in ethtool self test
[deliverable/linux.git]
/
drivers
/
net
/
acenic.c
diff --git
a/drivers/net/acenic.c
b/drivers/net/acenic.c
index ee648fe5d96fc48b65c59c1a2965aea7902cbf63..d7c1bfe4b6ec277eaf89ba7ef2731bf4cd14c33c 100644
(file)
--- a/
drivers/net/acenic.c
+++ b/
drivers/net/acenic.c
@@
-68,6
+68,7
@@
#include <linux/sockios.h>
#include <linux/firmware.h>
#include <linux/slab.h>
#include <linux/sockios.h>
#include <linux/firmware.h>
#include <linux/slab.h>
+#include <linux/prefetch.h>
#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
#include <linux/if_vlan.h>
#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
#include <linux/if_vlan.h>
@@
-2658,15
+2659,15
@@
static int ace_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
link = readl(®s->GigLnkState);
if (link & LNK_1000MB)
link = readl(®s->GigLnkState);
if (link & LNK_1000MB)
- e
cmd->speed = SPEED_1000
;
+ e
thtool_cmd_speed_set(ecmd, SPEED_1000)
;
else {
link = readl(®s->FastLnkState);
if (link & LNK_100MB)
else {
link = readl(®s->FastLnkState);
if (link & LNK_100MB)
- e
cmd->speed = SPEED_100
;
+ e
thtool_cmd_speed_set(ecmd, SPEED_100)
;
else if (link & LNK_10MB)
else if (link & LNK_10MB)
- e
cmd->speed = SPEED_10
;
+ e
thtool_cmd_speed_set(ecmd, SPEED_10)
;
else
else
- e
cmd->speed = 0
;
+ e
thtool_cmd_speed_set(ecmd, 0)
;
}
if (link & LNK_FULL_DUPLEX)
ecmd->duplex = DUPLEX_FULL;
}
if (link & LNK_FULL_DUPLEX)
ecmd->duplex = DUPLEX_FULL;
@@
-2718,9
+2719,9
@@
static int ace_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
link |= LNK_TX_FLOW_CTL_Y;
if (ecmd->autoneg == AUTONEG_ENABLE)
link |= LNK_NEGOTIATE;
link |= LNK_TX_FLOW_CTL_Y;
if (ecmd->autoneg == AUTONEG_ENABLE)
link |= LNK_NEGOTIATE;
- if (e
cmd->speed
!= speed) {
+ if (e
thtool_cmd_speed(ecmd)
!= speed) {
link &= ~(LNK_1000MB | LNK_100MB | LNK_10MB);
link &= ~(LNK_1000MB | LNK_100MB | LNK_10MB);
- switch (
speed
) {
+ switch (
ethtool_cmd_speed(ecmd)
) {
case SPEED_1000:
link |= LNK_1000MB;
break;
case SPEED_1000:
link |= LNK_1000MB;
break;
This page took
0.026548 seconds
and
5
git commands to generate.