This reverts commit 5dd7bfbc5079cb375876e4e76191263fc28ae1a6. As Stephen Hemminger mentioned there is an ABI compatibility issue with this patch:
https://patchwork.ozlabs.org/patch/806049/#1757846 Signed-off-by: Scott Branden <scott.bran...@broadcom.com> --- ethtool-copy.h | 2 -- ethtool.8.in | 1 - ethtool.c | 8 +------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/ethtool-copy.h b/ethtool-copy.h index 4bb91eb..06fc04c 100644 --- a/ethtool-copy.h +++ b/ethtool-copy.h @@ -400,7 +400,6 @@ struct ethtool_modinfo { * a TX interrupt, when the packet rate is above @pkt_rate_high. * @rate_sample_interval: How often to do adaptive coalescing packet rate * sampling, measured in seconds. Must not be zero. - * @dmac: How many usecs to store packets before moving to host memory. * * Each pair of (usecs, max_frames) fields specifies that interrupts * should be coalesced until @@ -451,7 +450,6 @@ struct ethtool_coalesce { __u32 tx_coalesce_usecs_high; __u32 tx_max_coalesced_frames_high; __u32 rate_sample_interval; - __u32 dmac; }; /** diff --git a/ethtool.8.in b/ethtool.8.in index 6ad3065..90ead41 100644 --- a/ethtool.8.in +++ b/ethtool.8.in @@ -165,7 +165,6 @@ ethtool \- query or control network driver and hardware settings .BN tx\-usecs\-high .BN tx\-frames\-high .BN sample\-interval -.BN dmac .HP .B ethtool \-g|\-\-show\-ring .I devname diff --git a/ethtool.c b/ethtool.c index 1a2b7cc..c89b660 100644 --- a/ethtool.c +++ b/ethtool.c @@ -1337,7 +1337,6 @@ static int dump_coalesce(const struct ethtool_coalesce *ecoal) "sample-interval: %u\n" "pkt-rate-low: %u\n" "pkt-rate-high: %u\n" - "dmac: %u\n" "\n" "rx-usecs: %u\n" "rx-frames: %u\n" @@ -1363,7 +1362,6 @@ static int dump_coalesce(const struct ethtool_coalesce *ecoal) ecoal->rate_sample_interval, ecoal->pkt_rate_low, ecoal->pkt_rate_high, - ecoal->dmac, ecoal->rx_coalesce_usecs, ecoal->rx_max_coalesced_frames, @@ -2071,7 +2069,6 @@ static int do_scoalesce(struct cmd_context *ctx) int coal_adaptive_rx_wanted = -1; int coal_adaptive_tx_wanted = -1; s32 coal_sample_rate_wanted = -1; - s32 coal_dmac_wanted = -1; s32 coal_pkt_rate_low_wanted = -1; s32 coal_pkt_rate_high_wanted = -1; s32 coal_rx_usec_wanted = -1; @@ -2097,8 +2094,6 @@ static int do_scoalesce(struct cmd_context *ctx) &ecoal.use_adaptive_tx_coalesce }, { "sample-interval", CMDL_S32, &coal_sample_rate_wanted, &ecoal.rate_sample_interval }, - { "dmac", CMDL_S32, &coal_dmac_wanted, - &ecoal.dmac }, { "stats-block-usecs", CMDL_S32, &coal_stats_wanted, &ecoal.stats_block_coalesce_usecs }, { "pkt-rate-low", CMDL_S32, &coal_pkt_rate_low_wanted, @@ -4794,8 +4789,7 @@ static const struct option { " [rx-frames-high N]\n" " [tx-usecs-high N]\n" " [tx-frames-high N]\n" - " [sample-interval N]\n" - " [dmac N]\n" }, + " [sample-interval N]\n" }, { "-g|--show-ring", 1, do_gring, "Query RX/TX ring parameters" }, { "-G|--set-ring", 1, do_sring, "Set RX/TX ring parameters", " [ rx N ]\n" -- 2.5.0
