fix endian lossage in forcedeth
authorAl Viro <viro@ZenIV.linux.org.uk>
Wed, 26 Mar 2008 05:57:12 +0000 (05:57 +0000)
committerJeff Garzik <jeff@garzik.org>
Fri, 4 Apr 2008 21:26:16 +0000 (17:26 -0400)
a) if you initialize something with le32_to_cpu(...), then |= it
with host-endian and feed to cpu_to_le32(), it's most definitely
*not* __le32.  As sparse would've told you...

b) the whole sequence is |= cpu_to_le32(host-endian constant)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/forcedeth.c

index 980c2c229a71d5fa9a0b59c5921ad61aaf627f16..419f533006ab0800c1fed0bb712213e581ca5787 100644 (file)
@@ -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;