KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: ag71xx: store RX buffer size in the ag71xx struct

Browse source 
This allows to change the value dynamically.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39120
This commit is contained in:
Gabor Juhos 2013-12-17 16:27:44 +00:00
parent 088eea282d
commit b35e0da0f4
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h
View file

@ -53,7 +53,6 @@
#define AG71XX_TX_MTU_LEN 1540 #define AG71XX_TX_MTU_LEN 1540
#define AG71XX_RX_PKT_SIZE \ #define AG71XX_RX_PKT_SIZE \
(ETH_FRAME_LEN + ETH_FCS_LEN + VLAN_HLEN) (ETH_FRAME_LEN + ETH_FCS_LEN + VLAN_HLEN)
#define AG71XX_RX_BUF_SIZE (AG71XX_RX_PKT_SIZE + NET_SKB_PAD + NET_IP_ALIGN)
#define AG71XX_TX_RING_SIZE_DEFAULT 32 #define AG71XX_TX_RING_SIZE_DEFAULT 32
#define AG71XX_RX_RING_SIZE_DEFAULT 128 #define AG71XX_RX_RING_SIZE_DEFAULT 128
@ -169,6 +168,7 @@ struct ag71xx {
int duplex; int duplex;
unsigned int max_frame_len; unsigned int max_frame_len;
unsigned int rx_buf_size;
struct work_struct restart_work; struct work_struct restart_work;
struct delayed_work link_work; struct delayed_work link_work;

12
target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
View file

@ -191,7 +191,7 @@ static void ag71xx_ring_rx_clean(struct ag71xx *ag)
for (i = 0; i < ring->size; i++) for (i = 0; i < ring->size; i++)
if (ring->buf[i].rx_buf) { if (ring->buf[i].rx_buf) {
dma_unmap_single(&ag->dev->dev, ring->buf[i].dma_addr, dma_unmap_single(&ag->dev->dev, ring->buf[i].dma_addr,
AG71XX_RX_BUF_SIZE, DMA_FROM_DEVICE); ag->rx_buf_size, DMA_FROM_DEVICE);
kfree(ring->buf[i].rx_buf); kfree(ring->buf[i].rx_buf);
} }
} }
@ -217,15 +217,15 @@ static bool ag71xx_fill_rx_buf(struct ag71xx *ag, struct ag71xx_buf *buf,
{ {
void *data; void *data;
data = kmalloc(AG71XX_RX_BUF_SIZE + data = kmalloc(ag->rx_buf_size +
SKB_DATA_ALIGN(sizeof(struct skb_shared_info)), SKB_DATA_ALIGN(sizeof(struct skb_shared_info)),
GFP_ATOMIC); GFP_ATOMIC);
if (!data) if (!data)
return false; return false;
buf->rx_buf = data; buf->rx_buf = data;
buf->dma_addr = dma_map_single(&ag->dev->dev, data, buf->dma_addr = dma_map_single(&ag->dev->dev, data, ag->rx_buf_size,
AG71XX_RX_BUF_SIZE, DMA_FROM_DEVICE); DMA_FROM_DEVICE);
buf->desc->data = (u32) buf->dma_addr + offset; buf->desc->data = (u32) buf->dma_addr + offset;
return true; return true;
} }
@ -609,6 +609,8 @@ static int ag71xx_open(struct net_device *dev)
struct ag71xx *ag = netdev_priv(dev); struct ag71xx *ag = netdev_priv(dev);
int ret; int ret;
ag->rx_buf_size = AG71XX_RX_PKT_SIZE + NET_SKB_PAD + NET_IP_ALIGN;
ret = ag71xx_rings_init(ag); ret = ag71xx_rings_init(ag);
if (ret) if (ret)
goto err; goto err;
@ -890,7 +892,7 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
pktlen -= ETH_FCS_LEN; pktlen -= ETH_FCS_LEN;
dma_unmap_single(&dev->dev, ring->buf[i].dma_addr, dma_unmap_single(&dev->dev, ring->buf[i].dma_addr,
AG71XX_RX_BUF_SIZE, DMA_FROM_DEVICE); ag->rx_buf_size, DMA_FROM_DEVICE);
dev->stats.rx_packets++; dev->stats.rx_packets++;
dev->stats.rx_bytes += pktlen; dev->stats.rx_bytes += pktlen;