qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 03:50:37 +02:00
Code

ar71xx: merge ethernet driver performance fixes from trunk

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22676 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2010-08-16 19:23:48 +00:00
parent 20516b9105
commit e26bac435d
2 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar8216.c
View File

@ -39,7 +39,6 @@ int ag71xx_remove_ar8216_header(struct ag71xx *ag, struct sk_buff *skb,
return -EINVAL; return -EINVAL;
} }
skb_put(skb, pktlen);
skb_pull(skb, AR8216_HEADER_LEN); skb_pull(skb, AR8216_HEADER_LEN);
return 0; return 0;
} }

58
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
View File

@ -192,9 +192,28 @@ static void ag71xx_ring_rx_clean(struct ag71xx *ag)
} }
} }
static int ag71xx_rx_reserve(struct ag71xx *ag)
{
int reserve = 0;
if (ag71xx_get_pdata(ag)->is_ar724x) {
if (!ag71xx_has_ar8216(ag))
reserve = 2;
if (ag->phy_dev)
reserve += 4 - (ag->phy_dev->pkt_align % 4);
reserve %= 4;
}
return reserve + AG71XX_RX_PKT_RESERVE;
}
static int ag71xx_ring_rx_init(struct ag71xx *ag) static int ag71xx_ring_rx_init(struct ag71xx *ag)
{ {
struct ag71xx_ring *ring = &ag->rx_ring; struct ag71xx_ring *ring = &ag->rx_ring;
unsigned int reserve = ag71xx_rx_reserve(ag);
unsigned int i; unsigned int i;
int ret; int ret;
@ -212,14 +231,14 @@ static int ag71xx_ring_rx_init(struct ag71xx *ag)
struct sk_buff *skb; struct sk_buff *skb;
dma_addr_t dma_addr; dma_addr_t dma_addr;
skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE + AG71XX_RX_PKT_RESERVE); skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE + reserve);
if (!skb) { if (!skb) {
ret = -ENOMEM; ret = -ENOMEM;
break; break;
} }
skb->dev = ag->dev; skb->dev = ag->dev;
skb_reserve(skb, AG71XX_RX_PKT_RESERVE); skb_reserve(skb, reserve);
dma_addr = dma_map_single(&ag->dev->dev, skb->data, dma_addr = dma_map_single(&ag->dev->dev, skb->data,
AG71XX_RX_PKT_SIZE, AG71XX_RX_PKT_SIZE,
@ -242,6 +261,7 @@ static int ag71xx_ring_rx_init(struct ag71xx *ag)
static int ag71xx_ring_rx_refill(struct ag71xx *ag) static int ag71xx_ring_rx_refill(struct ag71xx *ag)
{ {
struct ag71xx_ring *ring = &ag->rx_ring; struct ag71xx_ring *ring = &ag->rx_ring;
unsigned int reserve = ag71xx_rx_reserve(ag);
unsigned int count; unsigned int count;
count = 0; count = 0;
@ -254,12 +274,11 @@ static int ag71xx_ring_rx_refill(struct ag71xx *ag)
dma_addr_t dma_addr; dma_addr_t dma_addr;
struct sk_buff *skb; struct sk_buff *skb;
skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE + skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE + reserve);
AG71XX_RX_PKT_RESERVE);
if (skb == NULL) if (skb == NULL)
break; break;
skb_reserve(skb, AG71XX_RX_PKT_RESERVE); skb_reserve(skb, reserve);
skb->dev = ag->dev; skb->dev = ag->dev;
dma_addr = dma_map_single(&ag->dev->dev, skb->data, dma_addr = dma_map_single(&ag->dev->dev, skb->data,
@ -769,32 +788,6 @@ static int ag71xx_tx_packets(struct ag71xx *ag)
return sent; return sent;
} }
static int ag71xx_rx_copy_skb(struct ag71xx *ag, struct sk_buff **pskb,
int pktlen)
{
struct sk_buff *copy_skb;
if (ag->phy_dev && (ag->phy_dev->pkt_align % 4) == 2)
goto keep;
copy_skb = netdev_alloc_skb(ag->dev, pktlen + NET_IP_ALIGN);
if (!copy_skb)
return -ENOMEM;
skb_reserve(copy_skb, NET_IP_ALIGN);
skb_copy_from_linear_data(*pskb, copy_skb->data, pktlen);
skb_put(copy_skb, pktlen);
dev_kfree_skb_any(*pskb);
*pskb = copy_skb;
return 0;
keep:
skb_put(*pskb, pktlen);
return 0;
}
static int ag71xx_rx_packets(struct ag71xx *ag, int limit) static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
{ {
struct net_device *dev = ag->dev; struct net_device *dev = ag->dev;
@ -832,10 +825,9 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
dev->stats.rx_packets++; dev->stats.rx_packets++;
dev->stats.rx_bytes += pktlen; dev->stats.rx_bytes += pktlen;
skb_put(skb, pktlen);
if (ag71xx_has_ar8216(ag)) if (ag71xx_has_ar8216(ag))
err = ag71xx_remove_ar8216_header(ag, skb, pktlen); err = ag71xx_remove_ar8216_header(ag, skb, pktlen);
else
err = ag71xx_rx_copy_skb(ag, &skb, pktlen);
if (err) { if (err) {
dev->stats.rx_dropped++; dev->stats.rx_dropped++;