Commit 9ffc513f authored by Grygorii Strashko's avatar Grygorii Strashko Committed by David S. Miller

net: ethernet: ti: davinci_cpdma: drop frame padding

Hence all users of davinci_cpdma switched to skb_put_padto() the frame
padding can be removed from it.
Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 61e7a22d
...@@ -518,7 +518,6 @@ int cpsw_init_common(struct cpsw_common *cpsw, void __iomem *ss_regs, ...@@ -518,7 +518,6 @@ int cpsw_init_common(struct cpsw_common *cpsw, void __iomem *ss_regs,
dma_params.num_chan = data->channels; dma_params.num_chan = data->channels;
dma_params.has_soft_reset = true; dma_params.has_soft_reset = true;
dma_params.min_packet_size = CPSW_MIN_PACKET_SIZE;
dma_params.desc_mem_size = data->bd_ram_size; dma_params.desc_mem_size = data->bd_ram_size;
dma_params.desc_align = 16; dma_params.desc_align = 16;
dma_params.has_ext_regs = true; dma_params.has_ext_regs = true;
......
...@@ -1034,11 +1034,6 @@ static int cpdma_chan_submit_si(struct submit_info *si) ...@@ -1034,11 +1034,6 @@ static int cpdma_chan_submit_si(struct submit_info *si)
return -ENOMEM; return -ENOMEM;
} }
if (len < ctlr->params.min_packet_size) {
len = ctlr->params.min_packet_size;
chan->stats.runt_transmit_buff++;
}
mode = CPDMA_DESC_OWNER | CPDMA_DESC_SOP | CPDMA_DESC_EOP; mode = CPDMA_DESC_OWNER | CPDMA_DESC_SOP | CPDMA_DESC_EOP;
cpdma_desc_to_port(chan, mode, si->directed); cpdma_desc_to_port(chan, mode, si->directed);
......
...@@ -26,7 +26,6 @@ struct cpdma_params { ...@@ -26,7 +26,6 @@ struct cpdma_params {
void __iomem *rxthresh, *rxfree; void __iomem *rxthresh, *rxfree;
int num_chan; int num_chan;
bool has_soft_reset; bool has_soft_reset;
int min_packet_size;
dma_addr_t desc_mem_phys; dma_addr_t desc_mem_phys;
dma_addr_t desc_hw_addr; dma_addr_t desc_hw_addr;
int desc_mem_size; int desc_mem_size;
......
...@@ -1850,7 +1850,6 @@ static int davinci_emac_probe(struct platform_device *pdev) ...@@ -1850,7 +1850,6 @@ static int davinci_emac_probe(struct platform_device *pdev)
dma_params.txcp = priv->emac_base + 0x640; dma_params.txcp = priv->emac_base + 0x640;
dma_params.rxcp = priv->emac_base + 0x660; dma_params.rxcp = priv->emac_base + 0x660;
dma_params.num_chan = EMAC_MAX_TXRX_CHANNELS; dma_params.num_chan = EMAC_MAX_TXRX_CHANNELS;
dma_params.min_packet_size = EMAC_DEF_MIN_ETHPKTSIZE;
dma_params.desc_hw_addr = hw_ram_addr; dma_params.desc_hw_addr = hw_ram_addr;
dma_params.desc_mem_size = pdata->ctrl_ram_size; dma_params.desc_mem_size = pdata->ctrl_ram_size;
dma_params.desc_align = 16; dma_params.desc_align = 16;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment