diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 20:24:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 20:24:53 -0400 |
| commit | 492b057c426e4aa747484958e18e9da29003985d (patch) | |
| tree | 34e08c24618688d8bcc190523028b5f94cce0c0b /drivers/net/sky2.c | |
| parent | 313485175da221c388f6a8ecf4c30062ba9bea17 (diff) | |
| parent | 300df7dc89cc276377fc020704e34875d5c473b6 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/net/sky2.c')
| -rw-r--r-- | drivers/net/sky2.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index a2ff9cb1e7ac..6b5946fe8ae2 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
| @@ -1690,7 +1690,6 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev) | |||
| 1690 | 1690 | ||
| 1691 | sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod); | 1691 | sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod); |
| 1692 | 1692 | ||
| 1693 | dev->trans_start = jiffies; | ||
| 1694 | return NETDEV_TX_OK; | 1693 | return NETDEV_TX_OK; |
| 1695 | 1694 | ||
| 1696 | mapping_unwind: | 1695 | mapping_unwind: |