Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David S. Miller [Fri, 9 Mar 2012 22:34:20 +0000 (14:34 -0800)]
14 files changed:
1  2 
MAINTAINERS
drivers/net/caif/caif_hsi.c
drivers/net/ethernet/atheros/atl1c/atl1c_main.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
drivers/net/ethernet/ibm/ehea/ehea_main.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/hyperv/netvsc_drv.c
drivers/net/usb/usbnet.c
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
net/ipv4/route.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_netlink.c

diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -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);
  
Simple merge
Simple merge
Simple merge
@@@ -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;
                }
Simple merge
Simple merge
Simple merge