From 62f6274dd2fb065a23784237fc67b2224336e9e9 Mon Sep 17 00:00:00 2001 From: Ron Mercer Date: Thu, 12 Feb 2009 16:37:48 -0800 Subject: [PATCH] --- yaml --- r: 131319 b: refs/heads/master c: 06a3d510faf6fdec43daaf6f4d94fe24edf650cd h: refs/heads/master i: 131317: 3ad8fef3d00e41d1ced623d43d0c022110a6ad76 131315: 23f2774ea6151f5689532e719c215a3f528243d3 131311: 06f61f49b6db9449aa59ad76ed62f4630f675954 v: v3 --- [refs] | 2 +- trunk/drivers/net/qlge/qlge_main.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 36198380a06b..4c1c8414bf00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2603c2c571978497019a50c4df84c185ffef356 +refs/heads/master: 06a3d510faf6fdec43daaf6f4d94fe24edf650cd diff --git a/trunk/drivers/net/qlge/qlge_main.c b/trunk/drivers/net/qlge/qlge_main.c index 5b75fc9a26ba..fc7d210ec96b 100644 --- a/trunk/drivers/net/qlge/qlge_main.c +++ b/trunk/drivers/net/qlge/qlge_main.c @@ -970,6 +970,8 @@ static void ql_update_sbq(struct ql_adapter *qdev, struct rx_ring *rx_ring) if (pci_dma_mapping_error(qdev->pdev, map)) { QPRINTK(qdev, IFUP, ERR, "PCI mapping failed.\n"); rx_ring->sbq_clean_idx = clean_idx; + dev_kfree_skb_any(sbq_desc->p.skb); + sbq_desc->p.skb = NULL; return; } pci_unmap_addr_set(sbq_desc, mapaddr, map);