diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-06-11 10:00:49 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2009-06-11 10:00:49 -0400 |
| commit | 36432dae73cf2c90a59b39c8df9fd8219272b005 (patch) | |
| tree | 660b9104305a809ec4fdeb295ca13d6e90790ecc /drivers/net/chelsio/sge.c | |
| parent | 440f0d588555892601cfe511728a0fc0c8204063 (diff) | |
| parent | bb400801c2f40bbd9a688818323ad09abfc4e581 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
Diffstat (limited to 'drivers/net/chelsio/sge.c')
| -rw-r--r-- | drivers/net/chelsio/sge.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c index 5e97a1a71d88..3711d64e45ef 100644 --- a/drivers/net/chelsio/sge.c +++ b/drivers/net/chelsio/sge.c | |||
| @@ -1879,7 +1879,6 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 1879 | cpl->vlan_valid = 0; | 1879 | cpl->vlan_valid = 0; |
| 1880 | 1880 | ||
| 1881 | send: | 1881 | send: |
| 1882 | dev->trans_start = jiffies; | ||
| 1883 | ret = t1_sge_tx(skb, adapter, 0, dev); | 1882 | ret = t1_sge_tx(skb, adapter, 0, dev); |
| 1884 | 1883 | ||
| 1885 | /* If transmit busy, and we reallocated skb's due to headroom limit, | 1884 | /* If transmit busy, and we reallocated skb's due to headroom limit, |