# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/09/13 13:31:48+09:00 tj@xxxxxxxxxxxxxxxx # via-velocity minor fix. # # drivers/net/via-velocity.c # 2004/09/13 13:31:37+09:00 tj@xxxxxxxxxxxxxxxx +1 -1 # Removed cpu_to_le32 call on OWNED_BY_NIC. This will produce # 0x01000000 on big endian machines while rdesc0.owner still evaluates # to 0x00000000 or 0x00000001. BTW, unless we reorder bit fields on # big endian machines or use u32's and cpu_to_le32'd bit mask macros, # current code won't work on big endian machines. # diff -Nru a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c --- a/drivers/net/via-velocity.c 2004-09-13 13:51:04 +09:00 +++ b/drivers/net/via-velocity.c 2004-09-13 13:51:04 +09:00 @@ -1038,7 +1038,7 @@ struct rx_desc *rd = vptr->rd_ring + dirty; /* Fine for an all zero Rx desc at init time as well */ - if (rd->rdesc0.owner == cpu_to_le32(OWNED_BY_NIC)) + if (rd->rdesc0.owner == OWNED_BY_NIC) break; if (!vptr->rd_info[dirty].skb) {