Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 215195
b: refs/heads/master
c: f94e290
h: refs/heads/master
i:
  215193: 14a4f87
  215191: d5f388c
v: v3
  • Loading branch information
Matt Carlson authored and David S. Miller committed Oct 17, 2010
1 parent c5db151 commit d783f9b
Show file tree
Hide file tree
Showing 2 changed files with 2 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: 52b02d04c801fff51ca49ad033210846d1713253
refs/heads/master: f94e290eba2f98e8f759d273d9d04e8487fb4b6b
3 changes: 1 addition & 2 deletions trunk/drivers/net/tg3.c
Original file line number Diff line number Diff line change
Expand Up @@ -4573,12 +4573,11 @@ static int tg3_alloc_rx_skb(struct tg3 *tp, struct tg3_rx_prodring_set *tpr,
u32 opaque_key, u32 dest_idx_unmasked)
{
struct tg3_rx_buffer_desc *desc;
struct ring_info *map, *src_map;
struct ring_info *map;
struct sk_buff *skb;
dma_addr_t mapping;
int skb_size, dest_idx;

src_map = NULL;
switch (opaque_key) {
case RXD_OPAQUE_RING_STD:
dest_idx = dest_idx_unmasked & tp->rx_std_ring_mask;
Expand Down

0 comments on commit d783f9b

Please sign in to comment.