diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:43:54 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:43:54 -0400 |
| commit | b160292cc216a50fd0cd386b0bda2cd48352c73b (patch) | |
| tree | ef07cf98f91353ee4c9ec1e1ca7a2a5d9d4b538a /drivers/net/meth.c | |
| parent | b37bde147890c8fea8369a5a4e230dabdea4ebfb (diff) | |
| parent | bbf25010f1a6b761914430f5fca081ec8c7accd1 (diff) | |
Merge Linux 2.6.23
Diffstat (limited to 'drivers/net/meth.c')
| -rw-r--r-- | drivers/net/meth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/meth.c b/drivers/net/meth.c index 92b403bf38b0..32bed6bc6c06 100644 --- a/drivers/net/meth.c +++ b/drivers/net/meth.c | |||
| @@ -405,7 +405,7 @@ static void meth_rx(struct net_device* dev, unsigned long int_status) | |||
| 405 | priv->stats.rx_length_errors++; | 405 | priv->stats.rx_length_errors++; |
| 406 | skb = priv->rx_skbs[priv->rx_write]; | 406 | skb = priv->rx_skbs[priv->rx_write]; |
| 407 | } else { | 407 | } else { |
| 408 | skb = alloc_skb(METH_RX_BUFF_SIZE, GFP_ATOMIC | GFP_DMA); | 408 | skb = alloc_skb(METH_RX_BUFF_SIZE, GFP_ATOMIC); |
| 409 | if (!skb) { | 409 | if (!skb) { |
| 410 | /* Ouch! No memory! Drop packet on the floor */ | 410 | /* Ouch! No memory! Drop packet on the floor */ |
| 411 | DPRINTK("No mem: dropping packet\n"); | 411 | DPRINTK("No mem: dropping packet\n"); |