diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-04 15:00:52 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-04 15:00:52 -0700 |
| commit | bfe87dbc7b4da5b05a1a78480e996787a500cc6f (patch) | |
| tree | f5730e4f9ae9b6ef8d21de3aedd8dc9f3af10bc5 /drivers/net/forcedeth.c | |
| parent | 23556323b22fef35bdc36465b7e7439ba3748c9f (diff) | |
| parent | 30ecce908b944079181938e61ddbc00c8b23798c (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/forcedeth.c')
| -rw-r--r-- | drivers/net/forcedeth.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 980c2c229a7..419f533006a 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c @@ -2112,9 +2112,8 @@ static inline void nv_tx_flip_ownership(struct net_device *dev) np->tx_pkts_in_progress--; if (np->tx_change_owner) { - __le32 flaglen = le32_to_cpu(np->tx_change_owner->first_tx_desc->flaglen); - flaglen |= NV_TX2_VALID; - np->tx_change_owner->first_tx_desc->flaglen = cpu_to_le32(flaglen); + np->tx_change_owner->first_tx_desc->flaglen |= + cpu_to_le32(NV_TX2_VALID); np->tx_pkts_in_progress++; np->tx_change_owner = np->tx_change_owner->next_tx_ctx; |