---

yaml --- r: 315777 b: refs/heads/master c: 7b1115e h: refs/heads/master i: 315775: c209776 v: v3
git-mirror · Jul 22, 2012 · d3c3386 · d3c3386
1 parent ba582f3
commit d3c3386
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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)