|
@@ -474,11 +474,13 @@ static void init_dma_desc_rings(struct net_device *dev)
|
|
for (i = 0; i < rxsize; i++) {
|
|
for (i = 0; i < rxsize; i++) {
|
|
struct dma_desc *p = priv->dma_rx + i;
|
|
struct dma_desc *p = priv->dma_rx + i;
|
|
|
|
|
|
- skb = netdev_alloc_skb_ip_align(dev, bfsize);
|
|
|
|
|
|
+ skb = __netdev_alloc_skb(dev, bfsize + NET_IP_ALIGN,
|
|
|
|
+ GFP_KERNEL);
|
|
if (unlikely(skb == NULL)) {
|
|
if (unlikely(skb == NULL)) {
|
|
pr_err("%s: Rx init fails; skb is NULL\n", __func__);
|
|
pr_err("%s: Rx init fails; skb is NULL\n", __func__);
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
|
|
+ skb_reserve(skb, NET_IP_ALIGN);
|
|
priv->rx_skbuff[i] = skb;
|
|
priv->rx_skbuff[i] = skb;
|
|
priv->rx_skbuff_dma[i] = dma_map_single(priv->device, skb->data,
|
|
priv->rx_skbuff_dma[i] = dma_map_single(priv->device, skb->data,
|
|
bfsize, DMA_FROM_DEVICE);
|
|
bfsize, DMA_FROM_DEVICE);
|
|
@@ -1401,7 +1403,7 @@ static int stmmac_change_mtu(struct net_device *dev, int new_mtu)
|
|
if (priv->plat->enh_desc)
|
|
if (priv->plat->enh_desc)
|
|
max_mtu = JUMBO_LEN;
|
|
max_mtu = JUMBO_LEN;
|
|
else
|
|
else
|
|
- max_mtu = BUF_SIZE_4KiB;
|
|
|
|
|
|
+ max_mtu = SKB_MAX_HEAD(NET_SKB_PAD + NET_IP_ALIGN);
|
|
|
|
|
|
if ((new_mtu < 46) || (new_mtu > max_mtu)) {
|
|
if ((new_mtu < 46) || (new_mtu > max_mtu)) {
|
|
pr_err("%s: invalid MTU, max MTU is: %d\n", dev->name, max_mtu);
|
|
pr_err("%s: invalid MTU, max MTU is: %d\n", dev->name, max_mtu);
|