From 9bf085bb3006df872ab0ce07d66eea035f06c396 Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Tue, 9 Feb 2010 01:34:21 +0000 Subject: [PATCH] --- yaml --- r: 184015 b: refs/heads/master c: 205859a2ff922d0587a819b08007398cbd0a6a30 h: refs/heads/master i: 184013: 9d183d16efcc4053f27f7903fb5bf3f39b04fa7c 184011: b179b708be0ab845136a10f48e3f39ab9b28a88a 184007: 8545ee6c67e107da3fa901fd744e51963e0a26b4 183999: 2968f9484c2f0523e4498d68c12d8d955e3a7da3 v: v3 --- [refs] | 2 +- trunk/drivers/net/benet/be_main.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7b7d5387ffd2..81279634242f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34a89b8c75abe2873a95524552cc266fdd3b6a85 +refs/heads/master: 205859a2ff922d0587a819b08007398cbd0a6a30 diff --git a/trunk/drivers/net/benet/be_main.c b/trunk/drivers/net/benet/be_main.c index c65c63427d41..1951d7620a88 100644 --- a/trunk/drivers/net/benet/be_main.c +++ b/trunk/drivers/net/benet/be_main.c @@ -636,9 +636,11 @@ get_rx_page_info(struct be_adapter *adapter, u16 frag_idx) rx_page_info = &adapter->rx_obj.page_info_tbl[frag_idx]; BUG_ON(!rx_page_info->page); - if (rx_page_info->last_page_user) + if (rx_page_info->last_page_user) { pci_unmap_page(adapter->pdev, pci_unmap_addr(rx_page_info, bus), adapter->big_page_size, PCI_DMA_FROMDEVICE); + rx_page_info->last_page_user = false; + } atomic_dec(&rxq->used); return rx_page_info; @@ -706,7 +708,7 @@ static void skb_fill_rx_data(struct be_adapter *adapter, skb->data_len = curr_frag_len - hdr_len; skb->tail += hdr_len; } - memset(page_info, 0, sizeof(*page_info)); + page_info->page = NULL; if (pktsize <= rx_frag_size) { BUG_ON(num_rcvd != 1); @@ -739,7 +741,7 @@ static void skb_fill_rx_data(struct be_adapter *adapter, skb->len += curr_frag_len; skb->data_len += curr_frag_len; - memset(page_info, 0, sizeof(*page_info)); + page_info->page = NULL; } BUG_ON(j > MAX_SKB_FRAGS);