2945c2945
< 	unsigned int pad;
---
> 	unsigned int max_pad, pad;
2947c2947
< 	pad = align ? align : NET_IP_ALIGN;
---
> 	max_pad = align ? align : NET_IP_ALIGN;
2949c2949
< 	skb = netdev_alloc_skb(dev, rx_buf_sz + pad);
---
> 	skb = netdev_alloc_skb(dev, rx_buf_sz + max_pad);
2953c2953,2956
< 	skb_reserve(skb, align ? ((pad - 1) & (unsigned long)skb->data) : pad);
---
> 	pad = align ? align - ((align - 1) & (unsigned long)skb->data) : NET_IP_ALIGN;
> 	if (pad == align) pad = 0;
> 
> 	skb_reserve(skb, pad);