diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-07 08:36:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-07 08:36:57 -0700 |
| commit | 4cac04dd63fa3b202ee313ed1afbbd135ab887ee (patch) | |
| tree | 8fa7ed0186030297c69ac95530853eb5c860a894 /drivers/net/forcedeth.c | |
| parent | e1c287b992d30dab86f1b1bfe1780d9d3a652b34 (diff) | |
| parent | bfe87dbc7b4da5b05a1a78480e996787a500cc6f (diff) | |
| download | kernel_replicant_linux-4cac04dd63fa3b202ee313ed1afbbd135ab887ee.tar.gz kernel_replicant_linux-4cac04dd63fa3b202ee313ed1afbbd135ab887ee.tar.bz2 kernel_replicant_linux-4cac04dd63fa3b202ee313ed1afbbd135ab887ee.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
fix endian lossage in forcedeth
net/tokenring/olympic.c section fixes
net: marvell.c fix sparse shadowed variable warning
[VLAN]: Fix egress priority mappings leak.
[TG3]: Add PHY workaround for 5784
[NET]: srandom32 fixes for networking v2
[IPV6]: Fix refcounting for anycast dst entries.
[IPV6]: inet6_dev on loopback should be kept until namespace stop.
[IPV6]: Event type in addrconf_ifdown is mis-used.
[ICMP]: Ensure that ICMP relookup maintains status quo
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 980c2c229a71..419f533006ab 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; |