diff options
Diffstat (limited to 'drivers/net/sundance.c')
-rw-r--r-- | drivers/net/sundance.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c index 5c396c2e6e76..d58e1891ca60 100644 --- a/drivers/net/sundance.c +++ b/drivers/net/sundance.c | |||
@@ -603,8 +603,8 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev, | |||
603 | strcmp (media[card_idx], "4") == 0) { | 603 | strcmp (media[card_idx], "4") == 0) { |
604 | np->speed = 100; | 604 | np->speed = 100; |
605 | np->mii_if.full_duplex = 1; | 605 | np->mii_if.full_duplex = 1; |
606 | } else if (strcmp (media[card_idx], "100mbps_hd") == 0 | 606 | } else if (strcmp (media[card_idx], "100mbps_hd") == 0 || |
607 | || strcmp (media[card_idx], "3") == 0) { | 607 | strcmp (media[card_idx], "3") == 0) { |
608 | np->speed = 100; | 608 | np->speed = 100; |
609 | np->mii_if.full_duplex = 0; | 609 | np->mii_if.full_duplex = 0; |
610 | } else if (strcmp (media[card_idx], "10mbps_fd") == 0 || | 610 | } else if (strcmp (media[card_idx], "10mbps_fd") == 0 || |
@@ -1079,8 +1079,8 @@ start_tx (struct sk_buff *skb, struct net_device *dev) | |||
1079 | tasklet_schedule(&np->tx_tasklet); | 1079 | tasklet_schedule(&np->tx_tasklet); |
1080 | 1080 | ||
1081 | /* On some architectures: explicitly flush cache lines here. */ | 1081 | /* On some architectures: explicitly flush cache lines here. */ |
1082 | if (np->cur_tx - np->dirty_tx < TX_QUEUE_LEN - 1 | 1082 | if (np->cur_tx - np->dirty_tx < TX_QUEUE_LEN - 1 && |
1083 | && !netif_queue_stopped(dev)) { | 1083 | !netif_queue_stopped(dev)) { |
1084 | /* do nothing */ | 1084 | /* do nothing */ |
1085 | } else { | 1085 | } else { |
1086 | netif_stop_queue (dev); | 1086 | netif_stop_queue (dev); |
@@ -1336,8 +1336,8 @@ static void rx_poll(unsigned long data) | |||
1336 | #endif | 1336 | #endif |
1337 | /* Check if the packet is long enough to accept without copying | 1337 | /* Check if the packet is long enough to accept without copying |
1338 | to a minimally-sized skbuff. */ | 1338 | to a minimally-sized skbuff. */ |
1339 | if (pkt_len < rx_copybreak | 1339 | if (pkt_len < rx_copybreak && |
1340 | && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { | 1340 | (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { |
1341 | skb_reserve(skb, 2); /* 16 byte align the IP header */ | 1341 | skb_reserve(skb, 2); /* 16 byte align the IP header */ |
1342 | pci_dma_sync_single_for_cpu(np->pci_dev, | 1342 | pci_dma_sync_single_for_cpu(np->pci_dev, |
1343 | le32_to_cpu(desc->frag[0].addr), | 1343 | le32_to_cpu(desc->frag[0].addr), |
@@ -1517,8 +1517,8 @@ static void set_rx_mode(struct net_device *dev) | |||
1517 | if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ | 1517 | if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ |
1518 | memset(mc_filter, 0xff, sizeof(mc_filter)); | 1518 | memset(mc_filter, 0xff, sizeof(mc_filter)); |
1519 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptAll | AcceptMyPhys; | 1519 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptAll | AcceptMyPhys; |
1520 | } else if ((dev->mc_count > multicast_filter_limit) | 1520 | } else if ((dev->mc_count > multicast_filter_limit) || |
1521 | || (dev->flags & IFF_ALLMULTI)) { | 1521 | (dev->flags & IFF_ALLMULTI)) { |
1522 | /* Too many to match, or accept all multicasts. */ | 1522 | /* Too many to match, or accept all multicasts. */ |
1523 | memset(mc_filter, 0xff, sizeof(mc_filter)); | 1523 | memset(mc_filter, 0xff, sizeof(mc_filter)); |
1524 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; | 1524 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; |