]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
staging: gdm72xx: remove unused code
authorMichalis Pappas <mpappas@fastmail.fm>
Tue, 1 Jul 2014 13:00:14 +0000 (14:00 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 9 Jul 2014 18:52:21 +0000 (11:52 -0700)
Remove code surrounded by otherwise unused #define LOOPBACK_TEST

Signed-off-by: Michalis Pappas <mpappas@fastmail.fm>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/gdm72xx/gdm_wimax.c

index cc3e80a211f683e1ea44a9e96f21f5958ff4cc90..ad3d6bc0f91f85fe9a0ebccfd92c6b9b48004d12 100644 (file)
@@ -369,8 +369,6 @@ int gdm_wimax_send_tx(struct sk_buff *skb, struct net_device *dev)
 static int gdm_wimax_tx(struct sk_buff *skb, struct net_device *dev)
 {
        int ret = 0;
-       struct nic *nic = netdev_priv(dev);
-       struct fsm_s *fsm = (struct fsm_s *)nic->sdk_data[SIOC_DATA_FSM].buf;
 
        dump_eth_packet(dev, "TX", skb->data, skb->len);
 
@@ -380,17 +378,6 @@ static int gdm_wimax_tx(struct sk_buff *skb, struct net_device *dev)
                return ret;
        }
 
-       #if !defined(LOOPBACK_TEST)
-       if (!fsm) {
-               netdev_err(dev, "ASSERTION ERROR: fsm is NULL!!\n");
-       } else if (fsm->m_status != M_CONNECTED) {
-               netdev_emerg(dev, "ASSERTION ERROR: Device is NOT ready. status=%d\n",
-                            fsm->m_status);
-               kfree_skb(skb);
-               return 0;
-       }
-       #endif
-
 #if defined(CONFIG_WIMAX_GDM72XX_QOS)
        ret = gdm_qos_send_hci_pkt(skb, dev);
 #else
@@ -921,12 +908,7 @@ int register_wimax_device(struct phy_dev *phy_dev, struct device *pdev)
        if (ret)
                goto cleanup;
 
-       #if defined(LOOPBACK_TEST)
-       netif_start_queue(dev);
-       netif_carrier_on(dev);
-       #else
        netif_carrier_off(dev);
-       #endif
 
 #ifdef CONFIG_WIMAX_GDM72XX_QOS
        gdm_qos_init(nic);