beceem: debug message format changes

Add more debug messages and make them similar to other drivers

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

diff --git a/drivers/staging/bcm/Bcmnet.c b/drivers/staging/bcm/Bcmnet.c
index bf3a04dca234b188d3179531993e6466e4a6a6e5..fbaf73a2e42c21b58541237c738e5e0e1385d371 100644 (file)
--- a/drivers/staging/bcm/Bcmnet.c
+++ b/drivers/staging/bcm/Bcmnet.c
@@ -16,17 +16,17 @@ static INT bcm_open(struct net_device *dev)
        PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);
 
        if (Adapter->fw_download_done == FALSE) {
-               pr_notice(DRV_NAME "%s: link up failed (download in progress)\n",
-                         dev->name);
+               pr_notice(PFX "%s: link up failed (download in progress)\n",
+                         dev->name);
                return -EBUSY;
        }
 
        if (netif_msg_ifup(Adapter))
-               pr_info(DRV_NAME "%s: enabling interface\n", dev->name);
+               pr_info(PFX "%s: enabling interface\n", dev->name);
 
        if (Adapter->LinkUpStatus) {
                if (netif_msg_link(Adapter))
-                       pr_info(DRV_NAME "%s: link up\n", dev->name);
+                       pr_info(PFX "%s: link up\n", dev->name);
 
                netif_carrier_on(Adapter->dev);
                netif_start_queue(Adapter->dev);
@@ -40,7 +40,7 @@ static INT bcm_close(struct net_device *dev)
        PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(dev);
 
        if (netif_msg_ifdown(Adapter))
-               pr_info(DRV_NAME "%s: disabling interface\n", dev->name);
+               pr_info(PFX "%s: disabling interface\n", dev->name);
 
        netif_carrier_off(dev);
        netif_stop_queue(dev);
@@ -106,7 +106,7 @@ static netdev_tx_t bcm_transmit(struct sk_buff *skb, struct net_device *dev)
 
        /* Now Enqueue the packet */
        if (netif_msg_tx_queued(Adapter))
-               pr_info(DRV_NAME "%s: enqueueing packet to queue %d\n",
+               pr_info(PFX "%s: enqueueing packet to queue %d\n",
                        dev->name, qindex);
 
        spin_lock(&Adapter->PackInfo[qindex].SFQueueLock);

diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 949aaa3b31910c85aa01b0c0c5456bc286fa09ac..1aa962fedb918c11628af2e2fb4047d292a173d7 100644 (file)
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -2138,7 +2138,7 @@ BOOLEAN CmControlResponseMessage(PMINI_ADAPTER Adapter,  /**<Pointer to the Adap
                                                                netif_start_queue(Adapter->dev);
                                                                Adapter->LinkUpStatus = 1;
                                                                if (netif_msg_link(Adapter))
-                                                                       pr_info(DRV_NAME "%s: link up\n", Adapter->dev->name);
+                                                                       pr_info(PFX "%s: link up\n", Adapter->dev->name);
                                                                atomic_set(&Adapter->TxPktAvail, 1);
                                                                wake_up(&Adapter->tx_packet_wait_queue);
                                                                Adapter->liTimeSinceLastNetEntry = get_seconds();

diff --git a/drivers/staging/bcm/InterfaceIsr.c b/drivers/staging/bcm/InterfaceIsr.c
index c1f8e7aa05f7d427d289e0754d4265adb98cc4e7..2d26e2ed38d9865a4a7e90fd28ad1bc5df57632d 100644 (file)
--- a/drivers/staging/bcm/InterfaceIsr.c
+++ b/drivers/staging/bcm/InterfaceIsr.c
@@ -7,6 +7,10 @@ static void read_int_callback(struct urb *urb/*, struct pt_regs *regs*/)
        PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)urb->context;
        PMINI_ADAPTER Adapter = psIntfAdapter->psAdapter ;
 
+       if (netif_msg_intr(Adapter))
+               pr_info(PFX "%s: interrupt status %d\n",
+                       Adapter->dev->name, status);
+
        if(Adapter->device_removed == TRUE)
        {
                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, INTF_INIT, DBG_LVL_ALL,"Device has Got Removed.");

diff --git a/drivers/staging/bcm/InterfaceRx.c b/drivers/staging/bcm/InterfaceRx.c
index 6f1ed78c975b490178756f0ef6711de308f2f62e..07326a97c4a247f96f11c3b753c677e9ddec112d 100644 (file)
--- a/drivers/staging/bcm/InterfaceRx.c
+++ b/drivers/staging/bcm/InterfaceRx.c
@@ -38,7 +38,9 @@ static void read_bulk_callback(struct urb *urb)
        PMINI_ADAPTER Adapter = psIntfAdapter->psAdapter;
        PLEADER pLeader = urb->transfer_buffer;
 
-
+       if (unlikely(netif_msg_rx_status(Adapter)))
+               pr_info(PFX "%s: rx urb status %d length %d\n",
+                       Adapter->dev->name, urb->status, urb->actual_length);
 
        if((Adapter->device_removed == TRUE)  ||
                (TRUE == Adapter->bEndPointHalted) ||
@@ -83,8 +85,9 @@ static void read_bulk_callback(struct urb *urb)
        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "Leader Status:0x%hX, Length:0x%hX, VCID:0x%hX", pLeader->Status,pLeader->PLength,pLeader->Vcid);
        if(MAX_CNTL_PKT_SIZE < pLeader->PLength)
        {
-               BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "Corrupted leader length...%d\n",
-                                       pLeader->PLength);
+               if (netif_msg_rx_err(Adapter))
+                       pr_info(PFX "%s: corrupted leader length...%d\n",
+                               Adapter->dev->name, pLeader->PLength);
                atomic_inc(&Adapter->RxPacketDroppedCount);
                atomic_add(pLeader->PLength, &Adapter->BadRxByteCount);
                atomic_dec(&psIntfAdapter->uNumRcbUsed);

diff --git a/drivers/staging/bcm/InterfaceTx.c b/drivers/staging/bcm/InterfaceTx.c
index a3dadf19538b773bf5d5c270f8f82f9c910e52db..f434b899a0d02ecddadaf66ba961107df912e747 100644 (file)
--- a/drivers/staging/bcm/InterfaceTx.c
+++ b/drivers/staging/bcm/InterfaceTx.c
@@ -9,6 +9,10 @@ static void write_bulk_callback(struct urb *urb/*, struct pt_regs *regs*/)
        PMINI_ADAPTER psAdapter = psIntfAdapter->psAdapter ;
        BOOLEAN bpowerDownMsg = FALSE ;
     PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
+
+    if (unlikely(netif_msg_tx_done(Adapter)))
+           pr_info(PFX "%s: transmit status %d\n", Adapter->dev->name, urb->status);
+
        if(urb->status != STATUS_SUCCESS)
        {
                if(urb->status == -EPIPE)

diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index 7f3a936529c5b4c8c9052c12d87d0e2ea00b58a3..8212af3ecf90a4ab4e18ab9df12e52badad3a8ad 100644 (file)
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -1896,7 +1896,7 @@ void beceem_protocol_reset (PMINI_ADAPTER Adapter)
        int i;
 
        if (netif_msg_link(Adapter))
-               pr_notice(DRV_NAME "%s: protocol reset\n", Adapter->dev->name);
+               pr_notice(PFX "%s: protocol reset\n", Adapter->dev->name);
 
        netif_carrier_off(Adapter->dev);
        netif_stop_queue(Adapter->dev);

diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index 7e8013c105a2865fba41f52061f39d3a829a132a..21b611c68d377f659a788024bc649b43351e51a6 100644 (file)
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -356,8 +356,11 @@ VOID PruneQueue(PMINI_ADAPTER Adapter,/**<Pointer to the driver control structur
 
                if(PacketToDrop)
                {
-                       if(netstats)
-                               netstats->tx_dropped++;
+                       if (netif_msg_tx_err(Adapter))
+                               pr_info(PFX "%s: tx queue %d overlimit\n", 
+                                       Adapter->dev->name, iIndex);
+
+                       netstats->tx_dropped++;
                        atomic_inc(&Adapter->TxDroppedPacketCount);
                        DEQUEUEPACKET(Adapter->PackInfo[iIndex].FirstTxQueue,
                                                Adapter->PackInfo[iIndex].LastTxQueue);