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

ar71xx: ag71xx: introduce ag71xx_has_ar8216() helper

Browse source 
SVN-Revision: 20505
This commit is contained in:
Gabor Juhos 2010-03-27 13:05:24 +00:00
parent 200db5ebb5
commit f9acf8ada1
3 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -456,6 +456,10 @@ 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);
static inline int ag71xx_has_ar8216(struct ag71xx *ag)
{
return ag71xx_get_pdata(ag)->has_ar8216;
}
#else #else
static inline void ag71xx_add_ar8216_header(struct ag71xx *ag, static inline void ag71xx_add_ar8216_header(struct ag71xx *ag,
struct sk_buff *skb) struct sk_buff *skb)
@ -467,6 +471,10 @@ static inline int ag71xx_remove_ar8216_header(struct ag71xx *ag,
{ {
return 0; return 0;
} }
static inline int ag71xx_has_ar8216(struct ag71xx *ag)
{
return 0;
}
#endif #endif
#ifdef CONFIG_AG71XX_DEBUG_FS #ifdef CONFIG_AG71XX_DEBUG_FS

16
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar8216.c
View file

@ -20,27 +20,17 @@
void ag71xx_add_ar8216_header(struct ag71xx *ag, struct sk_buff *skb) void ag71xx_add_ar8216_header(struct ag71xx *ag, struct sk_buff *skb)
{ {
struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag); skb_push(skb, AR8216_HEADER_LEN);
skb->data[0] = 0x10;
if (!pdata->has_ar8216) skb->data[1] = 0x80;
return;
skb_push(skb, AR8216_HEADER_LEN);
skb->data[0] = 0x10;
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)
{ {
struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
u8 type; u8 type;
if (!pdata->has_ar8216)
return 0;
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); skb_pull(skb, AR8216_HEADER_LEN);

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

@ -614,7 +614,8 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
if (!ag71xx_desc_empty(desc)) if (!ag71xx_desc_empty(desc))
goto err_drop; goto err_drop;
ag71xx_add_ar8216_header(ag, skb); if (ag71xx_has_ar8216(ag))
ag71xx_add_ar8216_header(ag, skb);
if (skb->len <= 0) { if (skb->len <= 0) {
DBG("%s: packet len is too small\n", ag->dev->name); DBG("%s: packet len is too small\n", ag->dev->name);
@ -772,7 +773,7 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
struct ag71xx_desc *desc = ring->buf[i].desc; struct ag71xx_desc *desc = ring->buf[i].desc;
struct sk_buff *skb; struct sk_buff *skb;
int pktlen; int pktlen;
int err; int err = 0;
if (ag71xx_desc_empty(desc)) if (ag71xx_desc_empty(desc))
break; break;
@ -795,7 +796,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;
err = ag71xx_remove_ar8216_header(ag, skb); if (ag71xx_has_ar8216(ag))
err = ag71xx_remove_ar8216_header(ag, skb);
if (err) { if (err) {
dev->stats.rx_dropped++; dev->stats.rx_dropped++;
kfree_skb(skb); kfree_skb(skb);