From d3c3386574306d856ee509429dfa22576a86ee03 Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Sun, 22 Jul 2012 07:15:41 +0000 Subject: [PATCH] --- yaml --- r: 315777 b: refs/heads/master c: 7b1115e017569219eccbcad2bc48b81e6b98df29 h: refs/heads/master i: 315775: c209776d604d9555fe32aee6fee64df673f328bc v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/e1000e/ethtool.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b19ce37abb03..e4ef4e44a882 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e10df2c63b5500ac32a250bb54f55b764abacf0d +refs/heads/master: 7b1115e017569219eccbcad2bc48b81e6b98df29 diff --git a/trunk/drivers/net/ethernet/intel/e1000e/ethtool.c b/trunk/drivers/net/ethernet/intel/e1000e/ethtool.c index 105d554ea9db..0349e2478df8 100644 --- a/trunk/drivers/net/ethernet/intel/e1000e/ethtool.c +++ b/trunk/drivers/net/ethernet/intel/e1000e/ethtool.c @@ -2061,6 +2061,7 @@ static const struct ethtool_ops e1000_ethtool_ops = { .get_coalesce = e1000_get_coalesce, .set_coalesce = e1000_set_coalesce, .get_rxnfc = e1000_get_rxnfc, + .get_ts_info = ethtool_op_get_ts_info, }; void e1000e_set_ethtool_ops(struct net_device *netdev)