diff options
Diffstat (limited to 'drivers/net/starfire.c')
-rw-r--r-- | drivers/net/starfire.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c index aa10158adb9e..95db60adde41 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/starfire.c | |||
@@ -1482,8 +1482,8 @@ static int __netdev_rx(struct net_device *dev, int *quota) | |||
1482 | printk(KERN_DEBUG " netdev_rx() normal Rx pkt length %d, quota %d.\n", pkt_len, *quota); | 1482 | printk(KERN_DEBUG " netdev_rx() normal Rx pkt length %d, quota %d.\n", pkt_len, *quota); |
1483 | /* Check if the packet is long enough to accept without copying | 1483 | /* Check if the packet is long enough to accept without copying |
1484 | to a minimally-sized skbuff. */ | 1484 | to a minimally-sized skbuff. */ |
1485 | if (pkt_len < rx_copybreak | 1485 | if (pkt_len < rx_copybreak && |
1486 | && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { | 1486 | (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { |
1487 | skb_reserve(skb, 2); /* 16 byte align the IP header */ | 1487 | skb_reserve(skb, 2); /* 16 byte align the IP header */ |
1488 | pci_dma_sync_single_for_cpu(np->pci_dev, | 1488 | pci_dma_sync_single_for_cpu(np->pci_dev, |
1489 | np->rx_info[entry].mapping, | 1489 | np->rx_info[entry].mapping, |
@@ -1793,8 +1793,8 @@ static void set_rx_mode(struct net_device *dev) | |||
1793 | 1793 | ||
1794 | if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ | 1794 | if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ |
1795 | rx_mode |= AcceptAll; | 1795 | rx_mode |= AcceptAll; |
1796 | } else if ((dev->mc_count > multicast_filter_limit) | 1796 | } else if ((dev->mc_count > multicast_filter_limit) || |
1797 | || (dev->flags & IFF_ALLMULTI)) { | 1797 | (dev->flags & IFF_ALLMULTI)) { |
1798 | /* Too many to match, or accept all multicasts. */ | 1798 | /* Too many to match, or accept all multicasts. */ |
1799 | rx_mode |= AcceptBroadcast|AcceptAllMulticast|PerfectFilter; | 1799 | rx_mode |= AcceptBroadcast|AcceptAllMulticast|PerfectFilter; |
1800 | } else if (dev->mc_count <= 14) { | 1800 | } else if (dev->mc_count <= 14) { |