diff options
author | Ajit Khaparde <ajitk@serverengines.com> | 2009-07-21 15:36:19 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-23 21:00:59 -0400 |
commit | 5be93b9a865344cf69958777c8d7c6f758cba416 (patch) | |
tree | 77c85b7b47d5c9e136666927cef2f6d21280ae60 /drivers/net/benet/be_ethtool.c | |
parent | 2eee40c7f7c3734b28456169b2945e07d5ac0e2d (diff) |
be2net: Add GRO support to the be2net driver. LRO is not supported anymore.
This patch removes support for INET_LRO and switches over to GRO.
Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/benet/be_ethtool.c')
-rw-r--r-- | drivers/net/benet/be_ethtool.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c index cccc5419ad72..f3f0f91e38c4 100644 --- a/drivers/net/benet/be_ethtool.c +++ b/drivers/net/benet/be_ethtool.c | |||
@@ -127,8 +127,6 @@ be_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce) | |||
127 | struct be_eq_obj *rx_eq = &adapter->rx_eq; | 127 | struct be_eq_obj *rx_eq = &adapter->rx_eq; |
128 | struct be_eq_obj *tx_eq = &adapter->tx_eq; | 128 | struct be_eq_obj *tx_eq = &adapter->tx_eq; |
129 | 129 | ||
130 | coalesce->rx_max_coalesced_frames = adapter->max_rx_coal; | ||
131 | |||
132 | coalesce->rx_coalesce_usecs = rx_eq->cur_eqd; | 130 | coalesce->rx_coalesce_usecs = rx_eq->cur_eqd; |
133 | coalesce->rx_coalesce_usecs_high = rx_eq->max_eqd; | 131 | coalesce->rx_coalesce_usecs_high = rx_eq->max_eqd; |
134 | coalesce->rx_coalesce_usecs_low = rx_eq->min_eqd; | 132 | coalesce->rx_coalesce_usecs_low = rx_eq->min_eqd; |
@@ -144,8 +142,7 @@ be_get_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce) | |||
144 | } | 142 | } |
145 | 143 | ||
146 | /* | 144 | /* |
147 | * This routine is used to set interrup coalescing delay *as well as* | 145 | * This routine is used to set interrup coalescing delay |
148 | * the number of pkts to coalesce for LRO. | ||
149 | */ | 146 | */ |
150 | static int | 147 | static int |
151 | be_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce) | 148 | be_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce) |
@@ -161,10 +158,6 @@ be_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce) | |||
161 | if (coalesce->use_adaptive_tx_coalesce == 1) | 158 | if (coalesce->use_adaptive_tx_coalesce == 1) |
162 | return -EINVAL; | 159 | return -EINVAL; |
163 | 160 | ||
164 | adapter->max_rx_coal = coalesce->rx_max_coalesced_frames; | ||
165 | if (adapter->max_rx_coal > BE_MAX_FRAGS_PER_FRAME) | ||
166 | adapter->max_rx_coal = BE_MAX_FRAGS_PER_FRAME; | ||
167 | |||
168 | /* if AIC is being turned on now, start with an EQD of 0 */ | 161 | /* if AIC is being turned on now, start with an EQD of 0 */ |
169 | if (rx_eq->enable_aic == 0 && | 162 | if (rx_eq->enable_aic == 0 && |
170 | coalesce->use_adaptive_rx_coalesce == 1) { | 163 | coalesce->use_adaptive_rx_coalesce == 1) { |