forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: ft1000: Fix coding style in ft1000_start_xmit 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:27 +01:00 • committed by Greg Kroah-Hartman
parent d8dfaf4c94
commit e31e33855a
1 changed files with 35 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

75
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
View file

@ -1022,61 +1022,56 @@ static int ft1000_copy_down_pkt(struct net_device *netdev, u8 * packet, u16 len)
static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev) static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct ft1000_info *pInfo = netdev_priv(dev); struct ft1000_info *pInfo = netdev_priv(dev);
struct ft1000_device *pFt1000Dev= pInfo->pFt1000Dev; struct ft1000_device *pFt1000Dev = pInfo->pFt1000Dev;
u8 *pdata; u8 *pdata;
int maxlen, pipe; int maxlen, pipe;
//DEBUG(" ft1000_start_xmit() entered\n");
//DEBUG(" ft1000_start_xmit() entered\n"); if (skb == NULL) {
DEBUG("ft1000_hw: ft1000_start_xmit:skb == NULL!!!\n");
return NETDEV_TX_OK;
}
if ( skb == NULL ) if (pFt1000Dev->status & FT1000_STATUS_CLOSING) {
{ DEBUG("network driver is closed, return\n");
DEBUG ("ft1000_hw: ft1000_start_xmit:skb == NULL!!!\n" ); goto err;
return NETDEV_TX_OK; }
} //DEBUG("ft1000_start_xmit 1:length of packet = %d\n", skb->len);
pipe =
usb_sndbulkpipe(pFt1000Dev->dev, pFt1000Dev->bulk_out_endpointAddr);
maxlen = usb_maxpacket(pFt1000Dev->dev, pipe, usb_pipeout(pipe));
//DEBUG("ft1000_start_xmit 2: pipe=%d dev->maxpacket = %d\n", pipe, maxlen);
if ( pFt1000Dev->status & FT1000_STATUS_CLOSING) pdata = (u8 *) skb->data;
{ /*for (i=0; i<skb->len; i++)
DEBUG("network driver is closed, return\n"); DEBUG("skb->data[%d]=%x ", i, *(skb->data+i));
goto err;
}
//DEBUG("ft1000_start_xmit 1:length of packet = %d\n", skb->len); DEBUG("\n"); */
pipe = usb_sndbulkpipe(pFt1000Dev->dev, pFt1000Dev->bulk_out_endpointAddr);
maxlen = usb_maxpacket(pFt1000Dev->dev, pipe, usb_pipeout(pipe));
//DEBUG("ft1000_start_xmit 2: pipe=%d dev->maxpacket = %d\n", pipe, maxlen);
pdata = (u8 *)skb->data; if (pInfo->mediastate == 0) {
/*for (i=0; i<skb->len; i++) /* Drop packet is mediastate is down */
DEBUG("skb->data[%d]=%x ", i, *(skb->data+i)); DEBUG("ft1000_hw:ft1000_start_xmit:mediastate is down\n");
goto err;
}
DEBUG("\n");*/ if ((skb->len < ENET_HEADER_SIZE) || (skb->len > ENET_MAX_SIZE)) {
/* Drop packet which has invalid size */
DEBUG("ft1000_hw:ft1000_start_xmit:invalid ethernet length\n");
if (pInfo->mediastate == 0) goto err;
{ }
/* Drop packet is mediastate is down */
DEBUG("ft1000_hw:ft1000_start_xmit:mediastate is down\n");
goto err;
}
if ( (skb->len < ENET_HEADER_SIZE) || (skb->len > ENET_MAX_SIZE) )
{
/* Drop packet which has invalid size */
DEBUG("ft1000_hw:ft1000_start_xmit:invalid ethernet length\n");
goto err;
}
//mbelian //mbelian
ft1000_copy_down_pkt(dev, (pdata+ENET_HEADER_SIZE-2), ft1000_copy_down_pkt(dev, (pdata + ENET_HEADER_SIZE - 2),
skb->len - ENET_HEADER_SIZE + 2); skb->len - ENET_HEADER_SIZE + 2);
err: err:
dev_kfree_skb(skb); dev_kfree_skb(skb);
//DEBUG(" ft1000_start_xmit() exit\n"); //DEBUG(" ft1000_start_xmit() exit\n");
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
// Function: ft1000_copy_up_pkt // Function: ft1000_copy_up_pkt