Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 369693
b: refs/heads/master
c: eb0cabb
h: refs/heads/master
i:
  369691: ca4f40a
v: v3
  • Loading branch information
Amir Vadai authored and David S. Miller committed Apr 24, 2013
1 parent fa85d41 commit ee5d620
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ec693d47010e8302e61e0bdf3f47496c5610641a
refs/heads/master: eb0cabbd1bebbf41858ded768c9cad8840708447
2 changes: 2 additions & 0 deletions trunk/drivers/net/ethernet/mellanox/mlx4/en_tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -752,6 +752,8 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
if (bounce)
tx_desc = mlx4_en_bounce_to_desc(priv, ring, index, desc_size);

skb_tx_timestamp(skb);

if (ring->bf_enabled && desc_size <= MAX_BF && !bounce && !vlan_tx_tag_present(skb)) {
*(__be32 *) (&tx_desc->ctrl.vlan_tag) |= cpu_to_be32(ring->doorbell_qpn);
op_own |= htonl((bf_index & 0xffff) << 8);
Expand Down

0 comments on commit ee5d620

Please sign in to comment.