summaryrefslogtreecommitdiffstats
path: root/drivers/net/jme.c
diff options
context:
space:
mode:
authorGuo-Fu Tseng2009-02-27 18:57:01 +0100
committerDavid S. Miller2009-03-02 05:39:31 +0100
commit7f7fd2da92b4ce20f55d3b7615089cf8e04cfffc (patch)
tree720664405ab7d943c800db4b660f86661d73b4dc /drivers/net/jme.c
parentjme: Modifies messages to display correct hardware version (diff)
downloadkernel-qcow2-linux-7f7fd2da92b4ce20f55d3b7615089cf8e04cfffc.tar.gz
kernel-qcow2-linux-7f7fd2da92b4ce20f55d3b7615089cf8e04cfffc.tar.xz
kernel-qcow2-linux-7f7fd2da92b4ce20f55d3b7615089cf8e04cfffc.zip
jme: Fix pci sync
We should sync ring descriptor to pci device after modifying it. Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/jme.c')
-rw-r--r--drivers/net/jme.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index 60cb99744d05..f65a09c363ed 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -1833,7 +1833,7 @@ jme_tx_vlan(struct sk_buff *skb, __le16 *vlan, u8 *flags)
}
static int
-jme_fill_first_tx_desc(struct jme_adapter *jme, struct sk_buff *skb, int idx)
+jme_fill_tx_desc(struct jme_adapter *jme, struct sk_buff *skb, int idx)
{
struct jme_ring *txring = jme->txring;
struct txdesc *txdesc;
@@ -1863,6 +1863,7 @@ jme_fill_first_tx_desc(struct jme_adapter *jme, struct sk_buff *skb, int idx)
if (jme_tx_tso(skb, &txdesc->desc1.mss, &flags))
jme_tx_csum(jme, skb, &flags);
jme_tx_vlan(skb, &txdesc->desc1.vlan, &flags);
+ jme_map_tx_skb(jme, skb, idx);
txdesc->desc1.flags = flags;
/*
* Set tx buffer info after telling NIC to send
@@ -1932,8 +1933,7 @@ jme_start_xmit(struct sk_buff *skb, struct net_device *netdev)
return NETDEV_TX_BUSY;
}
- jme_map_tx_skb(jme, skb, idx);
- jme_fill_first_tx_desc(jme, skb, idx);
+ jme_fill_tx_desc(jme, skb, idx);
jwrite32(jme, JME_TXCS, jme->reg_txcs |
TXCS_SELECT_QUEUE0 |