ar71xx: ag71xx: introduce ag71xx_has_ar8216() helper

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20505 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
index 5be89987bb406f22ad0470edc8d1d24e4f974fc0..c3137203f6a729833060572866e3cc34c4b71e5e 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
@@ -456,6 +456,10 @@ static void inline ag71xx_mii_ctrl_set_speed(struct ag71xx *ag,
 #ifdef CONFIG_AG71XX_AR8216_SUPPORT
 void ag71xx_add_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
 static inline void ag71xx_add_ar8216_header(struct ag71xx *ag,
                                           struct sk_buff *skb)
@@ -467,6 +471,10 @@ static inline int ag71xx_remove_ar8216_header(struct ag71xx *ag,
 {
        return 0;
 }
+static inline int ag71xx_has_ar8216(struct ag71xx *ag)
+{
+       return 0;
+}
 #endif
 
 #ifdef CONFIG_AG71XX_DEBUG_FS

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar8216.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar8216.c
index 5b3722651f311dc7eb6487b251ac06359ef8a5cb..564fae7eb59fe78da858555bb86fde93fd9f5f47 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar8216.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_ar8216.c
@@ -20,27 +20,17 @@
 
 void ag71xx_add_ar8216_header(struct ag71xx *ag, struct sk_buff *skb)
 {
-       struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
-
-       if (!pdata->has_ar8216)
-               return;
-
-        skb_push(skb, AR8216_HEADER_LEN);
-        skb->data[0] = 0x10;
-        skb->data[1] = 0x80;
+       skb_push(skb, AR8216_HEADER_LEN);
+       skb->data[0] = 0x10;
+       skb->data[1] = 0x80;
 }
 
 int ag71xx_remove_ar8216_header(struct ag71xx *ag,
                                struct sk_buff *skb)
 {
-       struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
        u8 type;
 
-       if (!pdata->has_ar8216)
-               return 0;
-
        type = skb->data[1] & AR8216_PACKET_TYPE_MASK;
-
        switch (type) {
        case AR8216_PACKET_TYPE_NORMAL:
                skb_pull(skb, AR8216_HEADER_LEN);

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
index 3cf4f5eced79342e385e07922bff959ce14cd7d9..f4c5a12147bf0f66f531cb9ffcf7c420dfafaf99 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -614,7 +614,8 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
        if (!ag71xx_desc_empty(desc))
                goto err_drop;
 
-       ag71xx_add_ar8216_header(ag, skb);
+       if (ag71xx_has_ar8216(ag))
+               ag71xx_add_ar8216_header(ag, skb);
 
        if (skb->len <= 0) {
                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 sk_buff *skb;
                int pktlen;
-               int err;
+               int err = 0;
 
                if (ag71xx_desc_empty(desc))
                        break;
@@ -795,7 +796,9 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
                dev->stats.rx_packets++;
                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) {
                        dev->stats.rx_dropped++;
                        kfree_skb(skb);