diff options
| author | Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com> | 2011-05-10 07:12:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-12 01:10:02 +0200 |
| commit | 009dd872d753f854cf13c8334e0055092f539b38 (patch) | |
| tree | e96485a62c75f4b20f128b40f695ab6e0e82539a /drivers/net/benet | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff) | |
| download | linux-009dd872d753f854cf13c8334e0055092f539b38.tar.xz linux-009dd872d753f854cf13c8334e0055092f539b38.zip | |
be2net: Handle error completion in Lancer
In Lancer if a frame is DMAed partially due to lack of RX buffers,
an error completion is sent with packet size as zero and num_recvd
indicating number of used buffers. These buffers need to be freed
and packet dropped.
Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/benet')
| -rw-r--r-- | drivers/net/benet/be_main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 3fb4a1f465e1..3202f67d8785 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -1757,12 +1757,15 @@ static int be_poll_rx(struct napi_struct *napi, int budget) break; /* Ignore flush completions */ - if (rxcp->num_rcvd) { + if (rxcp->num_rcvd && rxcp->pkt_size) { if (do_gro(rxcp)) be_rx_compl_process_gro(adapter, rxo, rxcp); else be_rx_compl_process(adapter, rxo, rxcp); + } else if (rxcp->pkt_size == 0) { + be_rx_compl_discard(adapter, rxo, rxcp); } + be_rx_stats_update(rxo, rxcp); } |