Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 23309
b: refs/heads/master
c: 1524007
h: refs/heads/master
i:
  23307: a43833a
v: v3
  • Loading branch information
Stephen Hemminger authored and Jeff Garzik committed Mar 23, 2006
1 parent 6d29e46 commit ce1c887
Show file tree
Hide file tree
Showing 2 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: 050ff18016979b98e3cadb930d6e29bfd5530469
refs/heads/master: 15240072ac3ffb67050acd0b71b477c3bb977670
4 changes: 2 additions & 2 deletions trunk/drivers/net/sky2.c
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,7 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
/* just drop the packet if non-linear expansion fails */
if (skb_header_cloned(skb) &&
pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) {
dev_kfree_skb_any(skb);
dev_kfree_skb(skb);
goto out_unlock;
}

Expand Down Expand Up @@ -1324,7 +1324,7 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done)
PCI_DMA_TODEVICE);
}

dev_kfree_skb_any(skb);
dev_kfree_skb(skb);
}

sky2->tx_cons = put;
Expand Down

0 comments on commit ce1c887

Please sign in to comment.