summaryrefslogtreecommitdiff
path: root/cleopatre/linux-2.6.25.10-spc300/drivers
diff options
context:
space:
mode:
authorsave2010-03-31 08:04:14 +0000
committersave2010-03-31 08:04:14 +0000
commita3abfced0ba55476bbad5aa39475a72e14cf66e0 (patch)
tree13ffed8aea0f09b3baf9d2b2c1d4205b4c0ae81c /cleopatre/linux-2.6.25.10-spc300/drivers
parentc07aa5c79f815d9d0337f68a376c874e4496fc1f (diff)
cleo/linux/driver/eth: suppress GFP_KERNEL, it incompatible with GFP_DMA
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@6859 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cleopatre/linux-2.6.25.10-spc300/drivers')
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/drivers/net/arm/synop3504.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/cleopatre/linux-2.6.25.10-spc300/drivers/net/arm/synop3504.c b/cleopatre/linux-2.6.25.10-spc300/drivers/net/arm/synop3504.c
index 56cee0209c..6ba46ae7dc 100644
--- a/cleopatre/linux-2.6.25.10-spc300/drivers/net/arm/synop3504.c
+++ b/cleopatre/linux-2.6.25.10-spc300/drivers/net/arm/synop3504.c
@@ -296,7 +296,7 @@ static int synop3504_txdesc_init(struct net_device *dev)
struct net_priv *priv = (struct net_priv *)dev->priv;
int i;
//Alloc TX DMA descriptors area
- if((priv->tx.ring = (SynopsysDmaTx *)dma_alloc_coherent(NULL, sizeof(SynopsysDmaTx)*TX_RING_SIZE, &priv->tx.phy_addr, GFP_KERNEL|GFP_DMA)) == NULL)
+ if((priv->tx.ring = (SynopsysDmaTx *)dma_alloc_coherent(NULL, sizeof(SynopsysDmaTx)*TX_RING_SIZE, &priv->tx.phy_addr, GFP_DMA)) == NULL)
{
printk(KERN_ERR DRV_NAME": Error allocating TX descriptor buffers for %s\n", dev->name);
return -ENOMEM;
@@ -331,7 +331,7 @@ static int synop3504_rxdesc_init(struct net_device *dev)
struct sk_buff *skb;
int i;
//Alloc RX DMA descriptors area
- if((priv->rx.ring = (SynopsysDmaRx *)dma_alloc_coherent(NULL, sizeof(SynopsysDmaRx)*RX_RING_SIZE, &priv->rx.phy_addr, GFP_KERNEL|GFP_DMA)) == NULL)
+ if((priv->rx.ring = (SynopsysDmaRx *)dma_alloc_coherent(NULL, sizeof(SynopsysDmaRx)*RX_RING_SIZE, &priv->rx.phy_addr, GFP_DMA)) == NULL)
{
printk(KERN_ERR DRV_NAME": Error allocating RX descriptor buffers for %s\n", dev->name);
return -ENOMEM;
@@ -348,7 +348,7 @@ static int synop3504_rxdesc_init(struct net_device *dev)
priv->rx.ring[i].ctrl.bf.addr2en = 1;
//Prepare data
- skb = alloc_skb(PKT_BUF_SZ, GFP_KERNEL | GFP_DMA);
+ skb = alloc_skb(PKT_BUF_SZ, GFP_DMA);
if(!skb)
{
printk(KERN_ERR DRV_NAME": Error allocating RX buffers for %s\n",dev->name);
@@ -1122,7 +1122,7 @@ static void synop3504_rx(struct net_device *dev, int *budget)
}
//Pre-allocate a new buffer
- if((new_skb = alloc_skb(PKT_BUF_SZ, GFP_ATOMIC | GFP_KERNEL | GFP_DMA)) == NULL)
+ if((new_skb = alloc_skb(PKT_BUF_SZ, GFP_ATOMIC | GFP_DMA)) == NULL)
{
//Cannot allocate a new buffer re-use the same and drop the
//current frame