From 24fedec2630928fac91eaa04143568540dfaaeb9 Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Tue, 3 Apr 2012 22:59:38 +0000 Subject: [PATCH] --- yaml --- r: 300488 b: refs/heads/master c: 912b3b3d737cc8dc89a68568caf2355fb45d48ab h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 507b72231c0d..61e1f3ecfb38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50c0c110024fcd5718355ddc80f6853d7fe3e388 +refs/heads/master: 912b3b3d737cc8dc89a68568caf2355fb45d48ab diff --git a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c index f98e1511660f..ce431846fc6f 100644 --- a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +++ b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c @@ -481,6 +481,7 @@ static const struct ethtool_ops stmmac_ethtool_ops = { .get_wol = stmmac_get_wol, .set_wol = stmmac_set_wol, .get_sset_count = stmmac_get_sset_count, + .get_ts_info = ethtool_op_get_ts_info, }; void stmmac_set_ethtool_ops(struct net_device *netdev)