diff --git a/[refs] b/[refs] index 96423976c196..654e0c7ac274 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 350f75960c8ba317935b4274c56c16412e085b08 +refs/heads/master: da95b2d422b6eb2b76789bbdbfafb7e07c493e7a diff --git a/trunk/drivers/net/via-velocity.c b/trunk/drivers/net/via-velocity.c index 1e6b395c555f..04d3836bfa5d 100644 --- a/trunk/drivers/net/via-velocity.c +++ b/trunk/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);