]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
sfc: Use correct macro to set event bitfield
authorBen Hutchings <bhutchings@solarflare.com>
Wed, 15 Apr 2009 02:48:34 +0000 (19:48 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 15 Apr 2009 02:48:34 +0000 (19:48 -0700)
falcon_sim_phy_event() used EFX_OWORD_FIELD, which operates on
bitfields in 128-bit values, on an event, which is a 64-bit value.
This should be harmless - these macros always use little-endian
ordering, so it would read and write back the following 8 bytes
unchanged - but it is obviously wrong.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/sfc/falcon.c

index d4629ab2c614d64cbd553d1235fc60b79c86fb39..466a8abb005379d2698b48093e4ed6ab6f0378cd 100644 (file)
@@ -1176,9 +1176,9 @@ void falcon_sim_phy_event(struct efx_nic *efx)
 
        EFX_POPULATE_QWORD_1(phy_event, EV_CODE, GLOBAL_EV_DECODE);
        if (EFX_IS10G(efx))
-               EFX_SET_OWORD_FIELD(phy_event, XG_PHY_INTR, 1);
+               EFX_SET_QWORD_FIELD(phy_event, XG_PHY_INTR, 1);
        else
-               EFX_SET_OWORD_FIELD(phy_event, G_PHY0_INTR, 1);
+               EFX_SET_QWORD_FIELD(phy_event, G_PHY0_INTR, 1);
 
        falcon_generate_event(&efx->channel[0], &phy_event);
 }