staging: ft1000: Fix coding style in ft1000_copy_up_pkt function.

[pandora-kernel.git] / drivers / staging / ft1000 / ft1000-usb / ft1000_hw.c

diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index f07b3ed..6a9e5fa 100644 (file)
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -1085,109 +1085,100 @@ err:
 //              SUCCESS
 //
 //---------------------------------------------------------------------------
-static int ft1000_copy_up_pkt (struct urb *urb)
+static int ft1000_copy_up_pkt(struct urb *urb)
 {
        struct ft1000_info *info = urb->context;
-    struct ft1000_device *ft1000dev = info->pFt1000Dev;
-    struct net_device *net = ft1000dev->net;
-
-    u16 tempword;
-    u16 len;
-    u16 lena; //mbelian
-    struct sk_buff *skb;
-    u16 i;
-    u8 *pbuffer=NULL;
-    u8 *ptemp=NULL;
-    u16 *chksum;
-
-
-    //DEBUG("ft1000_copy_up_pkt entered\n");
-
-    if ( ft1000dev->status & FT1000_STATUS_CLOSING)
-    {
-        DEBUG("network driver is closed, return\n");
-        return STATUS_SUCCESS;
-    }
-
-    // Read length
-    len = urb->transfer_buffer_length;
-    lena = urb->actual_length; //mbelian
-    //DEBUG("ft1000_copy_up_pkt: transfer_buffer_length=%d, actual_buffer_len=%d\n",
-      //       urb->transfer_buffer_length, urb->actual_length);
-
-    chksum = (u16 *)ft1000dev->rx_buf;
-
-    tempword = *chksum++;
-    for (i=1; i<7; i++)
-    {
-        tempword ^= *chksum++;
-    }
-
-    if  (tempword != *chksum)
-    {
-        info->stats.rx_errors ++;
-        ft1000_submit_rx_urb(info);
-        return STATUS_FAILURE;
-    }
-
-
-    //DEBUG("ft1000_copy_up_pkt: checksum is correct %x\n", *chksum);
-
-    skb = dev_alloc_skb(len+12+2);
-
-    if (skb == NULL)
-    {
-        DEBUG("ft1000_copy_up_pkt: No Network buffers available\n");
-        info->stats.rx_errors++;
-        ft1000_submit_rx_urb(info);
-        return STATUS_FAILURE;
-    }
-
-    pbuffer = (u8 *)skb_put(skb, len+12);
+       struct ft1000_device *ft1000dev = info->pFt1000Dev;
+       struct net_device *net = ft1000dev->net;
 
-    //subtract the number of bytes read already
-    ptemp = pbuffer;
+       u16 tempword;
+       u16 len;
+       u16 lena;               //mbelian
+       struct sk_buff *skb;
+       u16 i;
+       u8 *pbuffer = NULL;
+       u8 *ptemp = NULL;
+       u16 *chksum;
 
-    // fake MAC address
-    *pbuffer++ = net->dev_addr[0];
-    *pbuffer++ = net->dev_addr[1];
-    *pbuffer++ = net->dev_addr[2];
-    *pbuffer++ = net->dev_addr[3];
-    *pbuffer++ = net->dev_addr[4];
-    *pbuffer++ = net->dev_addr[5];
-    *pbuffer++ = 0x00;
-    *pbuffer++ = 0x07;
-    *pbuffer++ = 0x35;
-    *pbuffer++ = 0xff;
-    *pbuffer++ = 0xff;
-    *pbuffer++ = 0xfe;
+       //DEBUG("ft1000_copy_up_pkt entered\n");
 
+       if (ft1000dev->status & FT1000_STATUS_CLOSING) {
+               DEBUG("network driver is closed, return\n");
+               return STATUS_SUCCESS;
+       }
+       // Read length
+       len = urb->transfer_buffer_length;
+       lena = urb->actual_length;      //mbelian
+       //DEBUG("ft1000_copy_up_pkt: transfer_buffer_length=%d, actual_buffer_len=%d\n",
+       //       urb->transfer_buffer_length, urb->actual_length);
+
+       chksum = (u16 *) ft1000dev->rx_buf;
+
+       tempword = *chksum++;
+       for (i = 1; i < 7; i++)
+               tempword ^= *chksum++;
+
+       if (tempword != *chksum) {
+               info->stats.rx_errors++;
+               ft1000_submit_rx_urb(info);
+               return STATUS_FAILURE;
+       }
 
+       //DEBUG("ft1000_copy_up_pkt: checksum is correct %x\n", *chksum);
 
+       skb = dev_alloc_skb(len + 12 + 2);
 
-       memcpy(pbuffer, ft1000dev->rx_buf+sizeof(struct pseudo_hdr), len-sizeof(struct pseudo_hdr));
+       if (skb == NULL) {
+               DEBUG("ft1000_copy_up_pkt: No Network buffers available\n");
+               info->stats.rx_errors++;
+               ft1000_submit_rx_urb(info);
+               return STATUS_FAILURE;
+       }
 
-    //DEBUG("ft1000_copy_up_pkt: Data passed to Protocol layer\n");
-    /*for (i=0; i<len+12; i++)
-    {
-        DEBUG("ft1000_copy_up_pkt: Protocol Data: 0x%x\n ", *ptemp++);
-    }*/
+       pbuffer = (u8 *) skb_put(skb, len + 12);
+
+       /* subtract the number of bytes read already */
+       ptemp = pbuffer;
+
+       /* fake MAC address */
+       *pbuffer++ = net->dev_addr[0];
+       *pbuffer++ = net->dev_addr[1];
+       *pbuffer++ = net->dev_addr[2];
+       *pbuffer++ = net->dev_addr[3];
+       *pbuffer++ = net->dev_addr[4];
+       *pbuffer++ = net->dev_addr[5];
+       *pbuffer++ = 0x00;
+       *pbuffer++ = 0x07;
+       *pbuffer++ = 0x35;
+       *pbuffer++ = 0xff;
+       *pbuffer++ = 0xff;
+       *pbuffer++ = 0xfe;
+
+       memcpy(pbuffer, ft1000dev->rx_buf + sizeof(struct pseudo_hdr),
+              len - sizeof(struct pseudo_hdr));
+
+       //DEBUG("ft1000_copy_up_pkt: Data passed to Protocol layer\n");
+       /*for (i=0; i<len+12; i++)
+          {
+          DEBUG("ft1000_copy_up_pkt: Protocol Data: 0x%x\n ", *ptemp++);
+          } */
 
-    skb->dev = net;
+       skb->dev = net;
 
-    skb->protocol = eth_type_trans(skb, net);
-    skb->ip_summed = CHECKSUM_UNNECESSARY;
-    netif_rx(skb);
+       skb->protocol = eth_type_trans(skb, net);
+       skb->ip_summed = CHECKSUM_UNNECESSARY;
+       netif_rx(skb);
 
-    info->stats.rx_packets++;
-    // Add on 12 bytes for MAC address which was removed
-    info->stats.rx_bytes += (lena+12); //mbelian
+       info->stats.rx_packets++;
+       /* Add on 12 bytes for MAC address which was removed */
+       info->stats.rx_bytes += (lena + 12);    //mbelian
 
-    ft1000_submit_rx_urb(info);
-    //DEBUG("ft1000_copy_up_pkt exited\n");
-    return SUCCESS;
+       ft1000_submit_rx_urb(info);
+       //DEBUG("ft1000_copy_up_pkt exited\n");
+       return SUCCESS;
 }
 
+
 //---------------------------------------------------------------------------
 //
 // Function:   ft1000_submit_rx_urb