diff options
Diffstat (limited to 'drivers/net/ethernet/smsc')
-rw-r--r-- | drivers/net/ethernet/smsc/smc9194.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/smsc/smc91x.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/smsc/smsc9420.c | 4 |
3 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/ethernet/smsc/smc9194.c b/drivers/net/ethernet/smsc/smc9194.c index 50823da9dc1e..e85c2e7e8246 100644 --- a/drivers/net/ethernet/smsc/smc9194.c +++ b/drivers/net/ethernet/smsc/smc9194.c | |||
@@ -1223,9 +1223,7 @@ static void smc_rcv(struct net_device *dev) | |||
1223 | dev->stats.multicast++; | 1223 | dev->stats.multicast++; |
1224 | 1224 | ||
1225 | skb = netdev_alloc_skb(dev, packet_length + 5); | 1225 | skb = netdev_alloc_skb(dev, packet_length + 5); |
1226 | |||
1227 | if ( skb == NULL ) { | 1226 | if ( skb == NULL ) { |
1228 | printk(KERN_NOTICE CARDNAME ": Low memory, packet dropped.\n"); | ||
1229 | dev->stats.rx_dropped++; | 1227 | dev->stats.rx_dropped++; |
1230 | goto done; | 1228 | goto done; |
1231 | } | 1229 | } |
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c index 591650a8de38..dfbf978315df 100644 --- a/drivers/net/ethernet/smsc/smc91x.c +++ b/drivers/net/ethernet/smsc/smc91x.c | |||
@@ -465,8 +465,6 @@ static inline void smc_rcv(struct net_device *dev) | |||
465 | */ | 465 | */ |
466 | skb = netdev_alloc_skb(dev, packet_len); | 466 | skb = netdev_alloc_skb(dev, packet_len); |
467 | if (unlikely(skb == NULL)) { | 467 | if (unlikely(skb == NULL)) { |
468 | printk(KERN_NOTICE "%s: Low memory, packet dropped.\n", | ||
469 | dev->name); | ||
470 | SMC_WAIT_MMU_BUSY(lp); | 468 | SMC_WAIT_MMU_BUSY(lp); |
471 | SMC_SET_MMU_CMD(lp, MC_RELEASE); | 469 | SMC_SET_MMU_CMD(lp, MC_RELEASE); |
472 | dev->stats.rx_dropped++; | 470 | dev->stats.rx_dropped++; |
diff --git a/drivers/net/ethernet/smsc/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c index d457fa2d7509..ffa5c4ad1210 100644 --- a/drivers/net/ethernet/smsc/smsc9420.c +++ b/drivers/net/ethernet/smsc/smsc9420.c | |||
@@ -848,10 +848,8 @@ static int smsc9420_alloc_rx_buffer(struct smsc9420_pdata *pd, int index) | |||
848 | BUG_ON(pd->rx_buffers[index].skb); | 848 | BUG_ON(pd->rx_buffers[index].skb); |
849 | BUG_ON(pd->rx_buffers[index].mapping); | 849 | BUG_ON(pd->rx_buffers[index].mapping); |
850 | 850 | ||
851 | if (unlikely(!skb)) { | 851 | if (unlikely(!skb)) |
852 | smsc_warn(RX_ERR, "Failed to allocate new skb!"); | ||
853 | return -ENOMEM; | 852 | return -ENOMEM; |
854 | } | ||
855 | 853 | ||
856 | mapping = pci_map_single(pd->pdev, skb_tail_pointer(skb), | 854 | mapping = pci_map_single(pd->pdev, skb_tail_pointer(skb), |
857 | PKT_BUF_SZ, PCI_DMA_FROMDEVICE); | 855 | PKT_BUF_SZ, PCI_DMA_FROMDEVICE); |