aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/fealnx.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/fealnx.c')
-rw-r--r--drivers/net/fealnx.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index e173515790c0..dac4e595589e 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -1629,8 +1629,8 @@ static int netdev_rx(struct net_device *dev)
1629 if (debug) 1629 if (debug)
1630 printk(KERN_DEBUG " netdev_rx() status was %8.8x.\n", rx_status); 1630 printk(KERN_DEBUG " netdev_rx() status was %8.8x.\n", rx_status);
1631 1631
1632 if ((!((rx_status & RXFSD) && (rx_status & RXLSD))) 1632 if ((!((rx_status & RXFSD) && (rx_status & RXLSD))) ||
1633 || (rx_status & ErrorSummary)) { 1633 (rx_status & ErrorSummary)) {
1634 if (rx_status & ErrorSummary) { /* there was a fatal error */ 1634 if (rx_status & ErrorSummary) { /* there was a fatal error */
1635 if (debug) 1635 if (debug)
1636 printk(KERN_DEBUG 1636 printk(KERN_DEBUG
@@ -1655,8 +1655,8 @@ static int netdev_rx(struct net_device *dev)
1655 cur = np->cur_rx; 1655 cur = np->cur_rx;
1656 while (desno <= np->really_rx_count) { 1656 while (desno <= np->really_rx_count) {
1657 ++desno; 1657 ++desno;
1658 if ((!(cur->status & RXOWN)) 1658 if ((!(cur->status & RXOWN)) &&
1659 && (cur->status & RXLSD)) 1659 (cur->status & RXLSD))
1660 break; 1660 break;
1661 /* goto next rx descriptor */ 1661 /* goto next rx descriptor */
1662 cur = cur->next_desc_logical; 1662 cur = cur->next_desc_logical;
@@ -1786,8 +1786,8 @@ static void __set_rx_mode(struct net_device *dev)
1786 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ 1786 if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
1787 memset(mc_filter, 0xff, sizeof(mc_filter)); 1787 memset(mc_filter, 0xff, sizeof(mc_filter));
1788 rx_mode = CR_W_PROM | CR_W_AB | CR_W_AM; 1788 rx_mode = CR_W_PROM | CR_W_AB | CR_W_AM;
1789 } else if ((dev->mc_count > multicast_filter_limit) 1789 } else if ((dev->mc_count > multicast_filter_limit) ||
1790 || (dev->flags & IFF_ALLMULTI)) { 1790 (dev->flags & IFF_ALLMULTI)) {
1791 /* Too many to match, or accept all multicasts. */ 1791 /* Too many to match, or accept all multicasts. */
1792 memset(mc_filter, 0xff, sizeof(mc_filter)); 1792 memset(mc_filter, 0xff, sizeof(mc_filter));
1793 rx_mode = CR_W_AB | CR_W_AM; 1793 rx_mode = CR_W_AB | CR_W_AM;