diff options
-rw-r--r-- | drivers/net/jme.c | 6 |
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) | |||
1833 | } | 1833 | } |
1834 | 1834 | ||
1835 | static int | 1835 | static int |
1836 | jme_fill_first_tx_desc(struct jme_adapter *jme, struct sk_buff *skb, int idx) | 1836 | jme_fill_tx_desc(struct jme_adapter *jme, struct sk_buff *skb, int idx) |
1837 | { | 1837 | { |
1838 | struct jme_ring *txring = jme->txring; | 1838 | struct jme_ring *txring = jme->txring; |
1839 | struct txdesc *txdesc; | 1839 | struct txdesc *txdesc; |
@@ -1863,6 +1863,7 @@ jme_fill_first_tx_desc(struct jme_adapter *jme, struct sk_buff *skb, int idx) | |||
1863 | if (jme_tx_tso(skb, &txdesc->desc1.mss, &flags)) | 1863 | if (jme_tx_tso(skb, &txdesc->desc1.mss, &flags)) |
1864 | jme_tx_csum(jme, skb, &flags); | 1864 | jme_tx_csum(jme, skb, &flags); |
1865 | jme_tx_vlan(skb, &txdesc->desc1.vlan, &flags); | 1865 | jme_tx_vlan(skb, &txdesc->desc1.vlan, &flags); |
1866 | jme_map_tx_skb(jme, skb, idx); | ||
1866 | txdesc->desc1.flags = flags; | 1867 | txdesc->desc1.flags = flags; |
1867 | /* | 1868 | /* |
1868 | * Set tx buffer info after telling NIC to send | 1869 | * Set tx buffer info after telling NIC to send |
@@ -1932,8 +1933,7 @@ jme_start_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
1932 | return NETDEV_TX_BUSY; | 1933 | return NETDEV_TX_BUSY; |
1933 | } | 1934 | } |
1934 | 1935 | ||
1935 | jme_map_tx_skb(jme, skb, idx); | 1936 | jme_fill_tx_desc(jme, skb, idx); |
1936 | jme_fill_first_tx_desc(jme, skb, idx); | ||
1937 | 1937 | ||
1938 | jwrite32(jme, JME_TXCS, jme->reg_txcs | | 1938 | jwrite32(jme, JME_TXCS, jme->reg_txcs | |
1939 | TXCS_SELECT_QUEUE0 | | 1939 | TXCS_SELECT_QUEUE0 | |