net: ethernet: ti: cpsw: don't duplicate common res in rx handler

No need to duplicate the same function in rx handler to get info
if any interface is running.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index c681d39419b07ad0f80242be2f6ca820a50c4bf9..1f14afdddb75682c0b65a0073b62766e44ae2956 100644 (file)
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -671,6 +671,18 @@ static void cpsw_intr_disable(struct cpsw_common *cpsw)
        return;
 }
 
+static int cpsw_get_usage_count(struct cpsw_common *cpsw)
+{
+       u32 i;
+       u32 usage_count = 0;
+
+       for (i = 0; i < cpsw->data.slaves; i++)
+               if (netif_running(cpsw->slaves[i].ndev))
+                       usage_count++;
+
+       return usage_count;
+}
+
 static void cpsw_tx_handler(void *token, int len, int status)
 {
        struct netdev_queue     *txq;
@@ -703,18 +715,10 @@ static void cpsw_rx_handler(void *token, int len, int status)
        cpsw_dual_emac_src_port_detect(cpsw, status, ndev, skb);
 
        if (unlikely(status < 0) || unlikely(!netif_running(ndev))) {
-               bool ndev_status = false;
-               struct cpsw_slave *slave = cpsw->slaves;
-               int n;
-
-               if (cpsw->data.dual_emac) {
-                       /* In dual emac mode check for all interfaces */
-                       for (n = cpsw->data.slaves; n; n--, slave++)
-                               if (netif_running(slave->ndev))
-                                       ndev_status = true;
-               }
-
-               if (ndev_status && (status >= 0)) {
+               /* In dual emac mode check for all interfaces */
+               if (cpsw->data.dual_emac &&
+                   cpsw_get_usage_count(cpsw) &&
+                   (status >= 0)) {
                        /* The packet received is for the interface which
                         * is already down and the other interface is up
                         * and running, instead of freeing which results
@@ -1234,18 +1238,6 @@ static void cpsw_get_ethtool_stats(struct net_device *ndev,
        }
 }
 
-static int cpsw_get_usage_count(struct cpsw_common *cpsw)
-{
-       u32 i;
-       u32 usage_count = 0;
-
-       for (i = 0; i < cpsw->data.slaves; i++)
-               if (netif_running(cpsw->slaves[i].ndev))
-                       usage_count++;
-
-       return usage_count;
-}
-
 static inline int cpsw_tx_packet_submit(struct cpsw_priv *priv,
                                        struct sk_buff *skb,
                                        struct cpdma_chan *txch)