Eliminate duplicated & dead code.

MFC after:	3 days
This commit is contained in:
zec 2013-11-08 22:40:33 +00:00
parent 6b902f8b12
commit 8dc17b647d

View File

@ -680,35 +680,6 @@ ngp_rcvdata(hook_p hook, item_p item)
struct mbuf *m1;
int longest = 0;
/* Find the longest queue */
TAILQ_FOREACH(ngp_f1, &hinfo->fifo_head, fifo_le)
if (ngp_f1->packets > longest) {
longest = ngp_f1->packets;
ngp_f = ngp_f1;
}
/* Drop a frame from the queue head/tail, depending on cfg */
if (hinfo->cfg.drophead)
ngp_h = TAILQ_FIRST(&ngp_f->packet_head);
else
ngp_h = TAILQ_LAST(&ngp_f->packet_head, p_head);
TAILQ_REMOVE(&ngp_f->packet_head, ngp_h, ngp_link);
m1 = ngp_h->m;
uma_zfree(ngp_zone, ngp_h);
hinfo->run.qin_octets -= m1->m_pkthdr.len;
hinfo->stats.in_disc_octets += m1->m_pkthdr.len;
m_freem(m1);
if (--(ngp_f->packets) == 0) {
TAILQ_REMOVE(&hinfo->fifo_head, ngp_f, fifo_le);
uma_zfree(ngp_zone, ngp_f);
hinfo->run.fifo_queues--;
}
hinfo->run.qin_frames--;
hinfo->stats.in_disc_frames++;
} else if (hinfo->run.qin_frames > hinfo->cfg.qin_size_limit) {
struct mbuf *m1;
int longest = 0;
/* Find the longest queue */
TAILQ_FOREACH(ngp_f1, &hinfo->fifo_head, fifo_le)
if (ngp_f1->packets > longest) {