diff options
| author | Simon Kagstrom <simon.kagstrom@netinsight.net> | 2009-11-25 23:09:53 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-27 00:51:06 +0100 |
| commit | da95b2d422b6eb2b76789bbdbfafb7e07c493e7a (patch) | |
| tree | 7ca2d1d0115d34364a7bc8c7ad558d3c5246f7be /drivers/net/via-velocity.c | |
| parent | r8169: move PHY regs tables to .rodata (diff) | |
| download | linux-da95b2d422b6eb2b76789bbdbfafb7e07c493e7a.tar.xz linux-da95b2d422b6eb2b76789bbdbfafb7e07c493e7a.zip | |
via-velocity: Correct 64-byte alignment for rx buffers
(From the VIA driver). The current code does not guarantee 64-byte
alignment since it simply does
int add = skb->data & 63;
skb->data += add;
(via skb_reserve). So for example, if the skb->data address would be
0x10, this would result in 32-byte alignment (0x10 + 0x10).
Correct by adding
64 - (skb->data & 63)
instead.
Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/via-velocity.c')
| -rw-r--r-- | drivers/net/via-velocity.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index 1e6b395c555f..04d3836bfa5d 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c @@ -1470,7 +1470,8 @@ static int velocity_alloc_rx_buf(struct velocity_info *vptr, int idx) * Do the gymnastics to get the buffer head for data at * 64byte alignment. */ - skb_reserve(rd_info->skb, (unsigned long) rd_info->skb->data & 63); + skb_reserve(rd_info->skb, + 64 - ((unsigned long) rd_info->skb->data & 63)); rd_info->skb_dma = pci_map_single(vptr->pdev, rd_info->skb->data, vptr->rx.buf_sz, PCI_DMA_FROMDEVICE); |