diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-01-17 22:43:16 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-18 01:27:30 +0100 |
| commit | a036119f977eeeae2089ddf5b4759de9ca5fbdb6 (patch) | |
| tree | b2375e6d37a5e79fb1a3e890c00c15c15ca2d57a /drivers/net | |
| parent | [PATCH] sky2: don't bother clearing status ring elements (diff) | |
| download | linux-a036119f977eeeae2089ddf5b4759de9ca5fbdb6.tar.xz linux-a036119f977eeeae2089ddf5b4759de9ca5fbdb6.zip | |
[PATCH] sky2: optimize for 32 bit dma
Small optimization, if dma addresses are 32 bits, then high
bits are always zero.
Signed-off-by: Stephen Hemminger <shemminger@osdl.or>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/sky2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 3c5d00403e5e..92ea915c1d4b 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -745,7 +745,7 @@ static inline struct sky2_rx_le *sky2_next_rx(struct sky2_port *sky2) /* Return high part of DMA address (could be 32 or 64 bit) */ static inline u32 high32(dma_addr_t a) { - return (a >> 16) >> 16; + return sizeof(a) > sizeof(u32) ? (a >> 16) >> 16 : 0; } /* Build description to hardware about buffer */ @@ -1225,7 +1225,7 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev) mapping = pci_map_page(hw->pdev, frag->page, frag->page_offset, frag->size, PCI_DMA_TODEVICE); - addr64 = (mapping >> 16) >> 16; + addr64 = high32(mapping); if (addr64 != sky2->tx_addr64) { le = get_tx_le(sky2); le->tx.addr = cpu_to_le32(addr64); |