From: Simon Kagstrom Date: Wed, 25 Nov 2009 22:09:53 +0000 (+0000) Subject: via-velocity: Correct 64-byte alignment for rx buffers X-Git-Tag: v2.6.33-rc1~388^2~206 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=da95b2d422b6eb2b76789bbdbfafb7e07c493e7a;p=~emulex%2Finfiniband.git 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index 1e6b395c555..04d3836bfa5 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);