Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 179814
b: refs/heads/master
c: 8581145
h: refs/heads/master
v: v3
  • Loading branch information
Alexander Duyck authored and David S. Miller committed Jan 23, 2010
1 parent df3a41c commit 925ee0c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: de4fc07aff770743b2c3e3ee30a23a691450a4f6
refs/heads/master: 8581145f39c39b00cd1b6a2dcb4ce5bf7d8d6070
2 changes: 1 addition & 1 deletion trunk/drivers/net/igb/igb_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -3584,6 +3584,7 @@ static inline int igb_tx_map_adv(struct igb_ring *tx_ring, struct sk_buff *skb,
for (f = 0; f < skb_shinfo(skb)->nr_frags; f++) {
struct skb_frag_struct *frag;

count++;
i++;
if (i == tx_ring->count)
i = 0;
Expand All @@ -3605,7 +3606,6 @@ static inline int igb_tx_map_adv(struct igb_ring *tx_ring, struct sk_buff *skb,
if (pci_dma_mapping_error(pdev, buffer_info->dma))
goto dma_error;

count++;
}

tx_ring->buffer_info[i].skb = skb;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/igbvf/netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -2126,6 +2126,7 @@ static inline int igbvf_tx_map_adv(struct igbvf_adapter *adapter,
for (f = 0; f < skb_shinfo(skb)->nr_frags; f++) {
struct skb_frag_struct *frag;

count++;
i++;
if (i == tx_ring->count)
i = 0;
Expand All @@ -2146,7 +2147,6 @@ static inline int igbvf_tx_map_adv(struct igbvf_adapter *adapter,
PCI_DMA_TODEVICE);
if (pci_dma_mapping_error(pdev, buffer_info->dma))
goto dma_error;
count++;
}

tx_ring->buffer_info[i].skb = skb;
Expand Down

0 comments on commit 925ee0c

Please sign in to comment.