beceem: Add proper carrier and link management

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

diff --git a/drivers/staging/bcm/InterfaceRx.c b/drivers/staging/bcm/InterfaceRx.c
index 6fee9684f2efd7805aa0aa94635ad76e8fd6f2b8..ab33895bfe5635318ea4a3cf29dc502a3f43bfb6 100644 (file)
--- a/drivers/staging/bcm/InterfaceRx.c
+++ b/drivers/staging/bcm/InterfaceRx.c
@@ -148,7 +148,7 @@ static void read_bulk_callback(struct urb *urb)
                atomic_add(pLeader->PLength, &Adapter->GoodRxByteCount);
         BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "Recived Data pkt of len :0x%X", pLeader->PLength);
 
-               if(Adapter->if_up)
+               if(netif_running(Adapter->dev))
                {
                        /* Moving ahead by ETH_HLEN to the data ptr as received from FW */
                        skb_pull(skb, ETH_HLEN);
@@ -173,7 +173,7 @@ static void read_bulk_callback(struct urb *urb)
                else
                {
                    BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_RX, RX_DATA, DBG_LVL_ALL, "i/f not up hance freeing SKB...");
-                       bcm_kfree_skb(skb);
+                       dev_kfree_skb(skb);
                }
                atomic_inc(&Adapter->GoodRxPktCount);
                for(uiIndex = 0 ; uiIndex < MIBS_MAX_HIST_ENTRIES ; uiIndex++)