From c209776d604d9555fe32aee6fee64df673f328bc Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Sun, 22 Jul 2012 07:15:39 +0000 Subject: [PATCH] --- yaml --- r: 315775 b: refs/heads/master c: be53ce1edde13599105c1de88c5bd593d26dfe22 h: refs/heads/master i: 315773: 5a6103aad11a62757d21849d8cd1562399f9cd47 315771: 798bf5308bcf0a95ba557afa58751f04b88c4115 315767: ed503897e8ace2ec92e1f74a3d45699ebdab457f 315759: 96dad23a1bcfb2de11369ecbf7f8ade2595172f2 315743: 250ff613d461bcaec48691d5d17cf420f332af56 315711: e78ad9f74bba0db1b9333a61fb369adb4711a139 315647: 8df9f2fbab2fc63d1e1ac6292e68b0d2d69fc7a5 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c92fd4b5b77d..d2ffe25ff29c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d69c2b343c7e1dc9584b7aa446f40dbab4c4f80 +refs/heads/master: be53ce1edde13599105c1de88c5bd593d26dfe22 diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c index bff31290198b..fc4e0e3885b0 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c +++ b/trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c @@ -2978,6 +2978,7 @@ static const struct ethtool_ops bnx2x_ethtool_ops = { .get_module_eeprom = bnx2x_get_module_eeprom, .get_eee = bnx2x_get_eee, .set_eee = bnx2x_set_eee, + .get_ts_info = ethtool_op_get_ts_info, }; void bnx2x_set_ethtool_ops(struct net_device *netdev)