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

backfire: ar71xx: fix broken LAN ports on the boards with AR8216 switch (closes #7024)

Browse Source 
* backport of r20673



git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@20677 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2010-04-03 16:58:04 +00:00
parent b8fd33bf5e
commit 0006dc25ed
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
View File

@ -455,7 +455,8 @@ static void inline ag71xx_mii_ctrl_set_speed(struct ag71xx *ag,
#ifdef CONFIG_AG71XX_AR8216_SUPPORT #ifdef CONFIG_AG71XX_AR8216_SUPPORT
void ag71xx_add_ar8216_header(struct ag71xx *ag, struct sk_buff *skb); void ag71xx_add_ar8216_header(struct ag71xx *ag, struct sk_buff *skb);
int ag71xx_remove_ar8216_header(struct ag71xx *ag, struct sk_buff *skb); int ag71xx_remove_ar8216_header(struct ag71xx *ag, struct sk_buff *skb,
int pktlen);
static inline int ag71xx_has_ar8216(struct ag71xx *ag) static inline int ag71xx_has_ar8216(struct ag71xx *ag)
{ {
return ag71xx_get_pdata(ag)->has_ar8216; return ag71xx_get_pdata(ag)->has_ar8216;
@ -467,7 +468,8 @@ static inline void ag71xx_add_ar8216_header(struct ag71xx *ag,
} }
static inline int ag71xx_remove_ar8216_header(struct ag71xx *ag, static inline int ag71xx_remove_ar8216_header(struct ag71xx *ag,
struct sk_buff *skb) struct sk_buff *skb,
int pktlen)
{ {
return 0; return 0;
} }

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

@ -25,19 +25,21 @@ void ag71xx_add_ar8216_header(struct ag71xx *ag, struct sk_buff *skb)
skb->data[1] = 0x80; skb->data[1] = 0x80;
} }
int ag71xx_remove_ar8216_header(struct ag71xx *ag, int ag71xx_remove_ar8216_header(struct ag71xx *ag, struct sk_buff *skb,
struct sk_buff *skb) int pktlen)
{ {
u8 type; u8 type;
type = skb->data[1] & AR8216_PACKET_TYPE_MASK; type = skb->data[1] & AR8216_PACKET_TYPE_MASK;
switch (type) { switch (type) {
case AR8216_PACKET_TYPE_NORMAL: case AR8216_PACKET_TYPE_NORMAL:
skb_pull(skb, AR8216_HEADER_LEN);
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
skb_put(skb, pktlen);
skb_pull(skb, AR8216_HEADER_LEN);
return 0; return 0;
} }

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

@ -770,6 +770,8 @@ static int ag71xx_rx_copy_skb(struct ag71xx *ag, struct sk_buff **pskb,
skb_reserve(copy_skb, NET_IP_ALIGN); skb_reserve(copy_skb, NET_IP_ALIGN);
skb_copy_from_linear_data(*pskb, copy_skb->data, pktlen); skb_copy_from_linear_data(*pskb, copy_skb->data, pktlen);
skb_put(copy_skb, pktlen);
dev_kfree_skb_any(*pskb); dev_kfree_skb_any(*pskb);
*pskb = copy_skb; *pskb = copy_skb;
@ -814,7 +816,7 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
dev->stats.rx_bytes += pktlen; dev->stats.rx_bytes += pktlen;
if (ag71xx_has_ar8216(ag)) if (ag71xx_has_ar8216(ag))
err = ag71xx_remove_ar8216_header(ag, skb); err = ag71xx_remove_ar8216_header(ag, skb, pktlen);
else else
err = ag71xx_rx_copy_skb(ag, &skb, pktlen); err = ag71xx_rx_copy_skb(ag, &skb, pktlen);
@ -822,8 +824,6 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
dev->stats.rx_dropped++; dev->stats.rx_dropped++;
kfree_skb(skb); kfree_skb(skb);
} else { } else {
skb_put(skb, pktlen);
skb->dev = dev; skb->dev = dev;
skb->ip_summed = CHECKSUM_NONE; skb->ip_summed = CHECKSUM_NONE;
skb->protocol = eth_type_trans(skb, dev); skb->protocol = eth_type_trans(skb, dev);