diff options
| author | Ajit Khaparde <ajitk@serverengines.com> | 2009-06-26 02:51:07 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-28 17:34:25 -0700 |
| commit | bd46cb6cf11867130a41ea9546dd65688b71f3c2 (patch) | |
| tree | bfd797129c817d3989f471914ef4979d008ef0d8 /drivers/net/benet/be_ethtool.c | |
| parent | ff780cd8f2fa928b193554f593b36d1243554212 (diff) | |
| download | blackbird-op-linux-bd46cb6cf11867130a41ea9546dd65688b71f3c2.tar.gz blackbird-op-linux-bd46cb6cf11867130a41ea9546dd65688b71f3c2.zip | |
be2net: Fix to avoid a crash seen on PPC with LRO and Jumbo frames.
While testing the driver on PPC, we ran into a crash with LRO, Jumbo frames.
With CONFIG_PPC_64K_PAGES configured (a default in PPC), MAX_SKB_FRAGS drops to 3 and we were crossing the array limits on skb_shinfo(skb)->frags[].
Now we coalesce the frags from the same physical page into one slot in
skb_shinfo(skb)->frags[] and go to the next index when the frag is from
different physical page.
This patch is against the net-2.6 tree.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c index 9592f22e4c8c..cccc5419ad72 100644 --- a/drivers/net/benet/be_ethtool.c +++ b/drivers/net/benet/be_ethtool.c @@ -162,8 +162,8 @@ be_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce) return -EINVAL; adapter->max_rx_coal = coalesce->rx_max_coalesced_frames; - if (adapter->max_rx_coal > MAX_SKB_FRAGS) - adapter->max_rx_coal = MAX_SKB_FRAGS - 1; + if (adapter->max_rx_coal > BE_MAX_FRAGS_PER_FRAME) + adapter->max_rx_coal = BE_MAX_FRAGS_PER_FRAME; /* if AIC is being turned on now, start with an EQD of 0 */ if (rx_eq->enable_aic == 0 && |
