aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/sk98lin/skethtool.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-01 15:49:37 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-01 15:49:37 -0800
commitf327220b1494aa23fd4206ac4778b8aa449a3351 (patch)
treeb463d2541db1638c7cb8b9ff10a9238fc8a47000 /drivers/net/sk98lin/skethtool.c
parent31b3c31bca3b4df975631323d6ee6f49f43f4956 (diff)
parentea182d4aefa3a27847d890b1592a608d1180aa45 (diff)
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/sk98lin/skethtool.c')
-rw-r--r--drivers/net/sk98lin/skethtool.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/sk98lin/skethtool.c b/drivers/net/sk98lin/skethtool.c
index fb639959292..b71769ae460 100644
--- a/drivers/net/sk98lin/skethtool.c
+++ b/drivers/net/sk98lin/skethtool.c
@@ -549,4 +549,6 @@ struct ethtool_ops SkGeEthtoolOps = {
.phys_id = locateDevice,
.get_pauseparam = getPauseParams,
.set_pauseparam = setPauseParams,
+ .get_link = ethtool_op_get_link,
+ .get_perm_addr = ethtool_op_get_perm_addr,
};