Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 90219
b: refs/heads/master
c: 235ffa1
h: refs/heads/master
i:
  90217: 9b0b05c
  90215: a4d1117
v: v3
  • Loading branch information
Jay Cliburn authored and Jeff Garzik committed Mar 17, 2008
1 parent 9d8844b commit b838742
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 5 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: 460578bfe4dffbdc6eec9fcbd0fe0bb4f9f82188
refs/heads/master: 235ffa136c09c56db0c6c5fc5b5832749a72f557
26 changes: 22 additions & 4 deletions trunk/drivers/net/atlx/atl1.c
Original file line number Diff line number Diff line change
Expand Up @@ -1144,14 +1144,32 @@ static void atl1_intr_rx(struct atl1_adapter *adapter)
/* check rrd status */
if (likely(rrd->num_buf == 1))
goto rrd_ok;
else if (netif_msg_rx_err(adapter)) {
dev_printk(KERN_DEBUG, &adapter->pdev->dev,
"unexpected RRD buffer count\n");
dev_printk(KERN_DEBUG, &adapter->pdev->dev,
"rx_buf_len = %d\n",
adapter->rx_buffer_len);
dev_printk(KERN_DEBUG, &adapter->pdev->dev,
"RRD num_buf = %d\n",
rrd->num_buf);
dev_printk(KERN_DEBUG, &adapter->pdev->dev,
"RRD pkt_len = %d\n",
rrd->xsz.xsum_sz.pkt_size);
dev_printk(KERN_DEBUG, &adapter->pdev->dev,
"RRD pkt_flg = 0x%08X\n",
rrd->pkt_flg);
dev_printk(KERN_DEBUG, &adapter->pdev->dev,
"RRD err_flg = 0x%08X\n",
rrd->err_flg);
dev_printk(KERN_DEBUG, &adapter->pdev->dev,
"RRD vlan_tag = 0x%08X\n",
rrd->vlan_tag);
}

/* rrd seems to be bad */
if (unlikely(i-- > 0)) {
/* rrd may not be DMAed completely */
if (netif_msg_rx_err(adapter))
dev_printk(KERN_DEBUG,
&adapter->pdev->dev,
"unexpected RRD count\n");
udelay(1);
goto chk_rrd;
}
Expand Down

0 comments on commit b838742

Please sign in to comment.