diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-21 01:29:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-21 01:29:08 -0400 |
| commit | 9f6ec8d697c08963d83880ccd35c13c5ace716ea (patch) | |
| tree | ad8d93cf6fcdd09b86ade09f5fcbbc66cdb1cca2 /drivers/net/netxen | |
| parent | 4aa3a715551c93eda32d79bd52042ce500bd5383 (diff) | |
| parent | 56299378726d5f2ba8d3c8cbbd13cb280ba45e4f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/rtlwifi/pci.c
net/netfilter/ipvs/ip_vs_core.c
Diffstat (limited to 'drivers/net/netxen')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 684cacec10f8..30f41e62049a 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
| @@ -1966,11 +1966,11 @@ netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
| 1966 | 1966 | ||
| 1967 | netxen_tso_check(netdev, tx_ring, first_desc, skb); | 1967 | netxen_tso_check(netdev, tx_ring, first_desc, skb); |
| 1968 | 1968 | ||
| 1969 | netxen_nic_update_cmd_producer(adapter, tx_ring); | ||
| 1970 | |||
| 1971 | adapter->stats.txbytes += skb->len; | 1969 | adapter->stats.txbytes += skb->len; |
| 1972 | adapter->stats.xmitcalled++; | 1970 | adapter->stats.xmitcalled++; |
| 1973 | 1971 | ||
| 1972 | netxen_nic_update_cmd_producer(adapter, tx_ring); | ||
| 1973 | |||
| 1974 | return NETDEV_TX_OK; | 1974 | return NETDEV_TX_OK; |
| 1975 | 1975 | ||
| 1976 | drop_packet: | 1976 | drop_packet: |