From ba582f3e8b8fd020335b9b3976316912c0fd2437 Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Sun, 22 Jul 2012 07:15:40 +0000 Subject: [PATCH] --- yaml --- r: 315776 b: refs/heads/master c: e10df2c63b5500ac32a250bb54f55b764abacf0d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d2ffe25ff29c..b19ce37abb03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be53ce1edde13599105c1de88c5bd593d26dfe22 +refs/heads/master: e10df2c63b5500ac32a250bb54f55b764abacf0d diff --git a/trunk/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/trunk/drivers/net/ethernet/intel/e1000/e1000_ethtool.c index 3103f0b6bf5e..736a7d987db5 100644 --- a/trunk/drivers/net/ethernet/intel/e1000/e1000_ethtool.c +++ b/trunk/drivers/net/ethernet/intel/e1000/e1000_ethtool.c @@ -1851,6 +1851,7 @@ static const struct ethtool_ops e1000_ethtool_ops = { .get_sset_count = e1000_get_sset_count, .get_coalesce = e1000_get_coalesce, .set_coalesce = e1000_set_coalesce, + .get_ts_info = ethtool_op_get_ts_info, }; void e1000_set_ethtool_ops(struct net_device *netdev)