From 408b7b5ec769698dee752ee40018e6fba2a67c6d Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 5 Nov 2012 16:20:42 +0000 Subject: [PATCH] --- yaml --- r: 340671 b: refs/heads/master c: ecfd2ce1a9d5e6376ff5c00b366345160abdbbb7 h: refs/heads/master i: 340669: 7873ca5089f5c943c7c2b1c37009efa521dfe7e9 340667: 8a75a46b82942f2692af702f539cd49f790ea863 340663: 03b42885d3cd170731700ebb8b080e17ad3176f5 340655: 0e441ab16464e93d572e65d827906ee116a1cd7f 340639: 7ed4986491b19714e5bc6e95136c1f8217bae4e7 340607: ff2778f1729eaba9990138b52ed90e7b33e7fd0c v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4dd47a277ef7..ce40c833d89a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f0a0986e328dd61610d898a09c9f4aa960ae64a +refs/heads/master: ecfd2ce1a9d5e6376ff5c00b366345160abdbbb7 diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index edd9cb8d3e1d..2b23ca21b320 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -870,7 +870,7 @@ static void mlx4_en_set_default_moderation(struct mlx4_en_priv *priv) /* If we haven't received a specific coalescing setting * (module param), we set the moderation parameters as follows: * - moder_cnt is set to the number of mtu sized packets to - * satisfy our coelsing target. + * satisfy our coalescing target. * - moder_time is set to a fixed value. */ priv->rx_frames = MLX4_EN_RX_COAL_TARGET; diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/trunk/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h index 9d27e42264e2..8a5e70d68894 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h @@ -126,7 +126,7 @@ enum { #define MLX4_EN_RX_COAL_TIME 0x10 #define MLX4_EN_TX_COAL_PKTS 16 -#define MLX4_EN_TX_COAL_TIME 0x80 +#define MLX4_EN_TX_COAL_TIME 0x10 #define MLX4_EN_RX_RATE_LOW 400000 #define MLX4_EN_RX_COAL_TIME_LOW 0