lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: ft1000: Fix coding style in ft1000_copy_up_pkt function.

Browse Source 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Marek Belisko
2011-03-10 11:51:29 +01:00
committed by Greg Kroah-Hartman
parent 6b2a66f250
commit bee1b21cfa
1 changed files with 72 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
View File

@@ -1100,15 +1100,12 @@ static int ft1000_copy_up_pkt (struct urb *urb)
u8 *ptemp = NULL; u8 *ptemp = NULL;
u16 *chksum; u16 *chksum;
//DEBUG("ft1000_copy_up_pkt entered\n"); //DEBUG("ft1000_copy_up_pkt entered\n");
if ( ft1000dev->status & FT1000_STATUS_CLOSING) if (ft1000dev->status & FT1000_STATUS_CLOSING) {
{
DEBUG("network driver is closed, return\n"); DEBUG("network driver is closed, return\n");
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
// Read length // Read length
len = urb->transfer_buffer_length; len = urb->transfer_buffer_length;
lena = urb->actual_length; //mbelian lena = urb->actual_length; //mbelian
@@ -1119,24 +1116,19 @@ static int ft1000_copy_up_pkt (struct urb *urb)
tempword = *chksum++; tempword = *chksum++;
for (i = 1; i < 7; i++) for (i = 1; i < 7; i++)
{
tempword ^= *chksum++; tempword ^= *chksum++;
}
if (tempword != *chksum) if (tempword != *chksum) {
{
info->stats.rx_errors++; info->stats.rx_errors++;
ft1000_submit_rx_urb(info); ft1000_submit_rx_urb(info);
return STATUS_FAILURE; return STATUS_FAILURE;
} }
//DEBUG("ft1000_copy_up_pkt: checksum is correct %x\n", *chksum); //DEBUG("ft1000_copy_up_pkt: checksum is correct %x\n", *chksum);
skb = dev_alloc_skb(len + 12 + 2); skb = dev_alloc_skb(len + 12 + 2);
if (skb == NULL) if (skb == NULL) {
{
DEBUG("ft1000_copy_up_pkt: No Network buffers available\n"); DEBUG("ft1000_copy_up_pkt: No Network buffers available\n");
info->stats.rx_errors++; info->stats.rx_errors++;
ft1000_submit_rx_urb(info); ft1000_submit_rx_urb(info);
@@ -1145,10 +1137,10 @@ static int ft1000_copy_up_pkt (struct urb *urb)
pbuffer = (u8 *) skb_put(skb, len + 12); pbuffer = (u8 *) skb_put(skb, len + 12);
//subtract the number of bytes read already /* subtract the number of bytes read already */
ptemp = pbuffer; ptemp = pbuffer;
// fake MAC address /* fake MAC address */
*pbuffer++ = net->dev_addr[0]; *pbuffer++ = net->dev_addr[0];
*pbuffer++ = net->dev_addr[1]; *pbuffer++ = net->dev_addr[1];
*pbuffer++ = net->dev_addr[2]; *pbuffer++ = net->dev_addr[2];
@@ -1162,10 +1154,8 @@ static int ft1000_copy_up_pkt (struct urb *urb)
*pbuffer++ = 0xff; *pbuffer++ = 0xff;
*pbuffer++ = 0xfe; *pbuffer++ = 0xfe;
memcpy(pbuffer, ft1000dev->rx_buf + sizeof(struct pseudo_hdr),
len - sizeof(struct pseudo_hdr));
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"); //DEBUG("ft1000_copy_up_pkt: Data passed to Protocol layer\n");
/*for (i=0; i<len+12; i++) /*for (i=0; i<len+12; i++)
@@ -1180,7 +1170,7 @@ static int ft1000_copy_up_pkt (struct urb *urb)
netif_rx(skb); netif_rx(skb);
info->stats.rx_packets++; info->stats.rx_packets++;
// Add on 12 bytes for MAC address which was removed /* Add on 12 bytes for MAC address which was removed */
info->stats.rx_bytes += (lena + 12); //mbelian info->stats.rx_bytes += (lena + 12); //mbelian
ft1000_submit_rx_urb(info); ft1000_submit_rx_urb(info);
@@ -1188,6 +1178,7 @@ static int ft1000_copy_up_pkt (struct urb *urb)
return SUCCESS; return SUCCESS;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
// Function: ft1000_submit_rx_urb // Function: ft1000_submit_rx_urb