OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[uclinux-h8/linux.git]
/
drivers
/
net
/
ethernet
/
qlogic
/
qede
/
qede_ethtool.c
diff --git
a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
index
e442b85
..
c49dc10
100644
(file)
--- a/
drivers/net/ethernet/qlogic/qede/qede_ethtool.c
+++ b/
drivers/net/ethernet/qlogic/qede/qede_ethtool.c
@@
-217,9
+217,9
@@
static int qede_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
struct qed_link_params params;
u32 speed;
struct qed_link_params params;
u32 speed;
- if (
edev->dev_info.common.is_mf
) {
+ if (
!edev->dev_info.common.is_mf_default
) {
DP_INFO(edev,
DP_INFO(edev,
- "Link parameters can not be changed in
MF
mode\n");
+ "Link parameters can not be changed in
non-default
mode\n");
return -EOPNOTSUPP;
}
return -EOPNOTSUPP;
}
@@
-428,7
+428,7
@@
static int qede_set_pauseparam(struct net_device *dev,
struct qed_link_params params;
struct qed_link_output current_link;
struct qed_link_params params;
struct qed_link_output current_link;
- if (!edev->dev_info.common.is_mf) {
+ if (!edev->dev_info.common.is_mf
_default
) {
DP_INFO(edev,
"Pause parameters can not be updated in non-default mode\n");
return -EOPNOTSUPP;
DP_INFO(edev,
"Pause parameters can not be updated in non-default mode\n");
return -EOPNOTSUPP;