Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 287516
b: refs/heads/master
c: 3f61cd8
h: refs/heads/master
v: v3
  • Loading branch information
Jesper Juhl authored and David S. Miller committed Feb 7, 2012
1 parent 9e86efb commit 0a98d42
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: da0912868527913eba15f5ebcfb420b32a037f1a
refs/heads/master: 3f61cd879c2f112c468e8849949b6fc88c739679
3 changes: 1 addition & 2 deletions trunk/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,6 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,
skb = build_skb(data);

if (likely(skb)) {

#ifdef BNX2X_STOP_ON_ERROR
if (pad + len > fp->rx_buf_size) {
BNX2X_ERR("skb_put is about to fail... "
Expand Down Expand Up @@ -557,7 +556,7 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp,

return;
}

kfree(new_data);
drop:
/* drop the packet and keep the buffer in the bin */
DP(NETIF_MSG_RX_STATUS,
Expand Down

0 comments on commit 0a98d42

Please sign in to comment.