Commit bee1b21c authored by Marek Belisko's avatar Marek Belisko Committed by Greg Kroah-Hartman

staging: ft1000: Fix coding style in ft1000_copy_up_pkt function.

Signed-off-by: default avatarMarek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6b2a66f2
......@@ -1085,7 +1085,7 @@ static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev)
// 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;
......@@ -1096,59 +1096,51 @@ static int ft1000_copy_up_pkt (struct urb *urb)
u16 lena; //mbelian
struct sk_buff *skb;
u16 i;
u8 *pbuffer=NULL;
u8 *ptemp=NULL;
u8 *pbuffer = NULL;
u8 *ptemp = NULL;
u16 *chksum;
//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");
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;
chksum = (u16 *) ft1000dev->rx_buf;
tempword = *chksum++;
for (i=1; i<7; i++)
{
for (i = 1; i < 7; i++)
tempword ^= *chksum++;
}
if (tempword != *chksum)
{
info->stats.rx_errors ++;
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);
skb = dev_alloc_skb(len + 12 + 2);
if (skb == NULL)
{
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);
pbuffer = (u8 *) skb_put(skb, len + 12);
//subtract the number of bytes read already
/* subtract the number of bytes read already */
ptemp = pbuffer;
// fake MAC address
/* fake MAC address */
*pbuffer++ = net->dev_addr[0];
*pbuffer++ = net->dev_addr[1];
*pbuffer++ = net->dev_addr[2];
......@@ -1162,16 +1154,14 @@ static int ft1000_copy_up_pkt (struct urb *urb)
*pbuffer++ = 0xff;
*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");
/*for (i=0; i<len+12; i++)
{
DEBUG("ft1000_copy_up_pkt: Protocol Data: 0x%x\n ", *ptemp++);
}*/
} */
skb->dev = net;
......@@ -1180,14 +1170,15 @@ static int ft1000_copy_up_pkt (struct urb *urb)
netif_rx(skb);
info->stats.rx_packets++;
// Add on 12 bytes for MAC address which was removed
info->stats.rx_bytes += (lena+12); //mbelian
/* 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;
}
//---------------------------------------------------------------------------
//
// Function: ft1000_submit_rx_urb
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment