beceem: remove useless debug function entry messages

[mv-sheeva.git] / drivers / staging / bcm / Bcmnet.c

diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c
index f0549912c9ec13189b9360717e4a4de06859a90e..9e3b872621be4c6c3148d7cf5a50ac4a87b4f669 100644 (file)
--- a/drivers/staging/bcm/Bcmnet.c
+++ b/drivers/staging/bcm/Bcmnet.c
@@ -1,11 +1,5 @@
 #include "headers.h"
 
-#define DRV_NAME       "beceem"
-#define DRV_VERSION    "5.2.7.3P1"
-#define DRV_DESCRIPTION "Beceem Communications Inc. WiMAX driver"
-#define DRV_COPYRIGHT  "Copyright 2010. Beceem Communications Inc"
-
-
 struct net_device *gblpnetdev;
 /***************************************************************************************/
 /* proto-type of lower function */
@@ -14,10 +8,8 @@ static INT bcm_open(struct net_device *dev)
 {
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);
 
-    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "======>");
     if(Adapter->fw_download_done==FALSE)
         return -EINVAL;
-       Adapter->if_up=1;
        if(Adapter->LinkUpStatus == 1){
                if(netif_queue_stopped(Adapter->dev)){
                        netif_carrier_on(Adapter->dev);
@@ -25,7 +17,6 @@ static INT bcm_open(struct net_device *dev)
                }
        }
 
-       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "<======");
     return 0;
 }
 
@@ -33,13 +24,10 @@ static INT bcm_close(struct net_device *dev)
 {
    PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);
 
-    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "=====>");
-       Adapter->if_up=0;
        if(!netif_queue_stopped(dev)) {
                netif_carrier_off(dev);
            netif_stop_queue(dev);
        }
-    BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,"<=====");
     return 0;
 }
 
@@ -62,6 +50,71 @@ static struct net_device_stats *bcm_get_stats(struct net_device *dev)
        return netstats;
 }
 
+static u16 bcm_select_queue(struct net_device *dev, struct sk_buff *skb)
+{
+       return ClassifyPacket(netdev_priv(dev), skb);
+}
+
+
+/*******************************************************************
+* Function    -        bcm_transmit()
+*
+* Description - This is the main transmit function for our virtual
+*                              interface(eth0). It handles the ARP packets. It
+*                              clones this packet and then Queue it to a suitable
+*                              Queue. Then calls the transmit_packet().
+*
+* Parameter   -         skb - Pointer to the socket buffer structure
+*                               dev - Pointer to the virtual net device structure
+*
+*********************************************************************/
+
+static netdev_tx_t bcm_transmit(struct sk_buff *skb, struct net_device *dev)
+{
+       PMINI_ADAPTER      Adapter = GET_BCM_ADAPTER(dev);
+       u16 qindex = skb_get_queue_mapping(skb);
+
+       if (Adapter->device_removed || !Adapter->LinkUpStatus)
+               goto drop;
+
+       if (Adapter->TransferMode != IP_PACKET_ONLY_MODE )
+               goto drop;
+
+       if (INVALID_QUEUE_INDEX==qindex)
+               goto drop;
+
+       if (Adapter->PackInfo[qindex].uiCurrentPacketsOnHost >= SF_MAX_ALLOWED_PACKETS_TO_BACKUP)
+               return NETDEV_TX_BUSY;
+
+       /* Now Enqueue the packet */
+       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, NEXT_SEND, DBG_LVL_ALL,
+                       "bcm_transmit Enqueueing the Packet To Queue %d",qindex);
+       spin_lock(&Adapter->PackInfo[qindex].SFQueueLock);
+       Adapter->PackInfo[qindex].uiCurrentBytesOnHost += skb->len;
+       Adapter->PackInfo[qindex].uiCurrentPacketsOnHost++;
+
+       *((B_UINT32 *)skb->cb + SKB_CB_LATENCY_OFFSET ) = jiffies;
+       ENQUEUEPACKET(Adapter->PackInfo[qindex].FirstTxQueue,
+                     Adapter->PackInfo[qindex].LastTxQueue, skb);
+       atomic_inc(&Adapter->TotalPacketCount);
+       spin_unlock(&Adapter->PackInfo[qindex].SFQueueLock);
+
+       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_TX, TX_OSAL_DBG, DBG_LVL_ALL,"ENQ: \n");
+
+       /* FIXME - this is racy and incorrect, replace with work queue */
+       if (!atomic_read(&Adapter->TxPktAvail)) {
+               atomic_set(&Adapter->TxPktAvail, 1);
+               wake_up(&Adapter->tx_packet_wait_queue);
+       }
+       return NETDEV_TX_OK;
+
+ drop:
+       dev_kfree_skb(skb);
+       return NETDEV_TX_OK;
+}
+
+
+
 /**
 @ingroup init_functions
 Register other driver entry points with the kernel
@@ -74,6 +127,7 @@ static const struct net_device_ops bcmNetDevOps = {
     .ndo_change_mtu    = eth_change_mtu,
     .ndo_set_mac_address = eth_mac_addr,
     .ndo_validate_addr = eth_validate_addr,
+    .ndo_select_queue  = bcm_select_queue,
 };
 
 static struct device_type wimax_type = {
@@ -125,27 +179,18 @@ static const struct ethtool_ops bcm_ethtool_ops = {
 
 int register_networkdev(PMINI_ADAPTER Adapter)
 {
-       struct net_device *net;
-       PMINI_ADAPTER *temp;
-       PS_INTERFACE_ADAPTER psIntfAdapter = Adapter->pvInterfaceAdapter;
-       struct usb_interface *uintf = psIntfAdapter->interface;
+       struct net_device *net = Adapter->dev;
        int result;
 
-       net = alloc_etherdev(sizeof(PMINI_ADAPTER));
-       if(!net) {
-               pr_notice("bcmnet: no memory for device\n");
-               return -ENOMEM;
-       }
-
-       Adapter->dev = net;     /* FIXME - only allows one adapter! */
-       temp = netdev_priv(net);
-       *temp = Adapter;
-
         net->netdev_ops = &bcmNetDevOps;
        net->ethtool_ops = &bcm_ethtool_ops;
-       net->mtu        = MTU_SIZE; /* 1400 Bytes */
+       net->mtu          = MTU_SIZE; /* 1400 Bytes */
+       net->tx_queue_len = TX_QLEN;
+       net->flags |= IFF_NOARP;
+       net->flags &= ~(IFF_BROADCAST|IFF_MULTICAST);
+
+       netif_carrier_off(net);
 
-       SET_NETDEV_DEV(net, &uintf->dev);
        SET_NETDEV_DEVTYPE(net, &wimax_type);
 
        /* Read the MAC Address from EEPROM */
@@ -162,15 +207,6 @@ int register_networkdev(PMINI_ADAPTER Adapter)
        return result;
 }
 
-void bcm_unregister_networkdev(PMINI_ADAPTER Adapter)
-{
-       BCM_DEBUG_PRINT(Adapter,DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "Unregistering the Net Dev...\n");
-       if(Adapter->dev) {
-               unregister_netdev(Adapter->dev);
-               Adapter->dev = NULL;
-       }
-}
-
 static int bcm_init(void)
 {
        printk(KERN_INFO "%s, %s\n", DRV_DESCRIPTION, DRV_VERSION);