From: David S. Miller <davem@davemloft.net>
Date: Fri, 9 Mar 2012 22:34:20 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b2d3298e0916fa059712691c85a0e97becc4ab9f;p=linux.git

Merge git://git./linux/kernel/git/davem/net
---

b2d3298e0916fa059712691c85a0e97becc4ab9f
diff --cc drivers/net/ethernet/broadcom/tg3.c
index bc236b6a7a91b,35c2a202d67aa..b0657466041d7
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@@ -6971,11 -6793,8 +6971,11 @@@ static netdev_tx_t tg3_start_xmit(struc
  	}
  
  	skb_tx_timestamp(skb);
- 	netdev_sent_queue(tp->dev, skb->len);
+ 	netdev_tx_sent_queue(txq, skb->len);
  
 +	/* Sync BD data before updating mailbox */
 +	wmb();
 +
  	/* Packets are ready, update Tx producer idx local and on card. */
  	tw32_tx_mbox(tnapi->prodmbox, entry);
  
diff --cc drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 915183a3a873b,ca78e91de86cb..f98baaba0c2a2
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@@ -1237,10 -1240,10 +1237,10 @@@ int iwlagn_suspend(struct iwl_priv *pri
  				.flags = CMD_SYNC,
  				.data[0] = key_data.rsc_tsc,
  				.dataflags[0] = IWL_HCMD_DFL_NOCOPY,
- 				.len[0] = sizeof(key_data.rsc_tsc),
+ 				.len[0] = sizeof(*key_data.rsc_tsc),
  			};
  
 -			ret = iwl_trans_send_cmd(trans(priv), &rsc_tsc_cmd);
 +			ret = iwl_dvm_send_cmd(priv, &rsc_tsc_cmd);
  			if (ret)
  				goto out;
  		}