Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324716
b: refs/heads/master
c: 3cf7c7a
h: refs/heads/master
v: v3
  • Loading branch information
Devendra Naga authored and Greg Kroah-Hartman committed Sep 4, 2012
1 parent 89da99d commit 0c873d4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4b9645b711153e5e7bbbc9f15766190124b3fe7c
refs/heads/master: 3cf7c7aaee1d97d39419fadc58110c1af552cefb
15 changes: 5 additions & 10 deletions trunk/drivers/staging/wlags49_h2/wl_netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -1795,22 +1795,19 @@ int wl_send_dma( struct wl_private *lp, struct sk_buff *skb, int port )

DBG_FUNC( "wl_send_dma" );

if( lp == NULL )
{
if( lp == NULL ) {
DBG_ERROR( DbgInfo, "Private adapter struct is NULL\n" );
return FALSE;
}

if( lp->dev == NULL )
{
if( lp->dev == NULL ) {
DBG_ERROR( DbgInfo, "net_device struct in wl_private is NULL\n" );
return FALSE;
}

/* AGAIN, ALL THE QUEUEING DONE HERE IN I/O MODE IS NOT PERFORMED */

if( skb == NULL )
{
if( skb == NULL ) {
DBG_WARNING (DbgInfo, "Nothing to send.\n");
return FALSE;
}
Expand All @@ -1820,8 +1817,7 @@ int wl_send_dma( struct wl_private *lp, struct sk_buff *skb, int port )
/* Get a free descriptor */
desc = wl_pci_dma_get_tx_packet( lp );

if( desc == NULL )
{
if( desc == NULL ) {
if( lp->netif_queue_on == TRUE ) {
netif_stop_queue( lp->dev );
WL_WDS_NETIF_STOP_QUEUE( lp );
Expand All @@ -1837,8 +1833,7 @@ int wl_send_dma( struct wl_private *lp, struct sk_buff *skb, int port )

desc_next = desc->next_desc_addr;

if( desc_next->buf_addr == NULL )
{
if( desc_next->buf_addr == NULL ) {
DBG_ERROR( DbgInfo, "DMA descriptor buf_addr is NULL\n" );
return FALSE;
}
Expand Down

0 comments on commit 0c873d4

Please sign in to comment.