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

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

@ -1026,23 +1026,20 @@ static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev)
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 ) if (skb == NULL) {
{
DEBUG("ft1000_hw: ft1000_start_xmit:skb == NULL!!!\n"); DEBUG("ft1000_hw: ft1000_start_xmit:skb == NULL!!!\n");
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
if ( pFt1000Dev->status & FT1000_STATUS_CLOSING) if (pFt1000Dev->status & FT1000_STATUS_CLOSING) {
{
DEBUG("network driver is closed, return\n"); DEBUG("network driver is closed, return\n");
goto err; goto err;
} }
//DEBUG("ft1000_start_xmit 1:length of packet = %d\n", skb->len); //DEBUG("ft1000_start_xmit 1:length of packet = %d\n", skb->len);
pipe = usb_sndbulkpipe(pFt1000Dev->dev, pFt1000Dev->bulk_out_endpointAddr); pipe =
usb_sndbulkpipe(pFt1000Dev->dev, pFt1000Dev->bulk_out_endpointAddr);
maxlen = usb_maxpacket(pFt1000Dev->dev, pipe, usb_pipeout(pipe)); maxlen = usb_maxpacket(pFt1000Dev->dev, pipe, usb_pipeout(pipe));
//DEBUG("ft1000_start_xmit 2: pipe=%d dev->maxpacket = %d\n", pipe, maxlen); //DEBUG("ft1000_start_xmit 2: pipe=%d dev->maxpacket = %d\n", pipe, maxlen);
@ -1052,16 +1049,13 @@ static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev)
DEBUG("\n"); */ DEBUG("\n"); */
if (pInfo->mediastate == 0) {
if (pInfo->mediastate == 0)
{
/* Drop packet is mediastate is down */ /* Drop packet is mediastate is down */
DEBUG("ft1000_hw:ft1000_start_xmit:mediastate is down\n"); DEBUG("ft1000_hw:ft1000_start_xmit:mediastate is down\n");
goto err; goto err;
} }
if ( (skb->len < ENET_HEADER_SIZE) || (skb->len > ENET_MAX_SIZE) ) if ((skb->len < ENET_HEADER_SIZE) || (skb->len > ENET_MAX_SIZE)) {
{
/* Drop packet which has invalid size */ /* Drop packet which has invalid size */
DEBUG("ft1000_hw:ft1000_start_xmit:invalid ethernet length\n"); DEBUG("ft1000_hw:ft1000_start_xmit:invalid ethernet length\n");
goto err; goto err;
@ -1077,6 +1071,7 @@ err:
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
// Function: ft1000_copy_up_pkt // Function: ft1000_copy_up_pkt