diff options
| author | Tony Luck <tony.luck@intel.com> | 2006-06-23 13:46:23 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-06-23 13:46:23 -0700 |
| commit | 8cf60e04a131310199d5776e2f9e915f0c468899 (patch) | |
| tree | 373a68e88e6737713a0a5723d552cdeefffff929 /drivers/net/bnx2.c | |
| parent | 1323523f505606cfd24af6122369afddefc3b09d (diff) | |
| parent | 95eaa5fa8eb2c345244acd5f65b200b115ae8c65 (diff) | |
| download | op-kernel-dev-8cf60e04a131310199d5776e2f9e915f0c468899.zip op-kernel-dev-8cf60e04a131310199d5776e2f9e915f0c468899.tar.gz | |
Auto-update from upstream
Diffstat (limited to 'drivers/net/bnx2.c')
| -rw-r--r-- | drivers/net/bnx2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 702d546..7635736 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -1640,7 +1640,7 @@ bnx2_tx_int(struct bnx2 *bp) skb = tx_buf->skb; #ifdef BCM_TSO /* partial BD completions possible with TSO packets */ - if (skb_shinfo(skb)->tso_size) { + if (skb_shinfo(skb)->gso_size) { u16 last_idx, last_ring_idx; last_idx = sw_cons + @@ -4428,7 +4428,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev) (TX_BD_FLAGS_VLAN_TAG | (vlan_tx_tag_get(skb) << 16)); } #ifdef BCM_TSO - if ((mss = skb_shinfo(skb)->tso_size) && + if ((mss = skb_shinfo(skb)->gso_size) && (skb->len > (bp->dev->mtu + ETH_HLEN))) { u32 tcp_opt_len, ip_tcp_len; |
