Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ar71xx: ag71xx: avoid unalinged accesses when using the phy specific receive functions

Browse source 
Cc: backfire@openwrt.org

SVN-Revision: 20751
This commit is contained in:
Gabor Juhos 2010-04-09 08:40:06 +00:00
parent 4a28844d80
commit 4c29a2c263
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,7 +38,7 @@
#define ETH_FCS_LEN 4 #define ETH_FCS_LEN 4
#define AG71XX_DRV_NAME "ag71xx" #define AG71XX_DRV_NAME "ag71xx"
#define AG71XX_DRV_VERSION "0.5.34" #define AG71XX_DRV_VERSION "0.5.35"
#define AG71XX_NAPI_WEIGHT 64 #define AG71XX_NAPI_WEIGHT 64
#define AG71XX_OOM_REFILL (1 + HZ/10) #define AG71XX_OOM_REFILL (1 + HZ/10)

7
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
View file

@ -764,6 +764,9 @@ static int ag71xx_rx_copy_skb(struct ag71xx *ag, struct sk_buff **pskb,
{ {
struct sk_buff *copy_skb; 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); copy_skb = netdev_alloc_skb(ag->dev, pktlen + NET_IP_ALIGN);
if (!copy_skb) if (!copy_skb)
return -ENOMEM; return -ENOMEM;
@ -776,6 +779,10 @@ static int ag71xx_rx_copy_skb(struct ag71xx *ag, struct sk_buff **pskb,
*pskb = copy_skb; *pskb = copy_skb;
return 0; 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)