diff options
| author | Pradeep A Dalvi <netdev@pradeepdalvi.com> | 2012-02-04 21:50:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-06 11:52:27 -0500 |
| commit | c056b734e54e12f38f34a2583a4824e6cecc16c1 (patch) | |
| tree | 78e501091b9f99477e9b919c03fd5b1930a46198 /drivers/net/ethernet/fujitsu | |
| parent | 21a4e46995fa1a76281ac0281ff837f706231a37 (diff) | |
netdev: ethernet dev_alloc_skb to netdev_alloc_skb
Replaced deprecating dev_alloc_skb with netdev_alloc_skb in drivers/net/ethernet
- Removed extra skb->dev = dev after netdev_alloc_skb
Signed-off-by: Pradeep A Dalvi <netdev@pradeepdalvi.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/fujitsu')
| -rw-r--r-- | drivers/net/ethernet/fujitsu/eth16i.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/fujitsu/eth16i.c b/drivers/net/ethernet/fujitsu/eth16i.c index b0e2313af3d1..c3f0178fb5cb 100644 --- a/drivers/net/ethernet/fujitsu/eth16i.c +++ b/drivers/net/ethernet/fujitsu/eth16i.c | |||
| @@ -1164,7 +1164,7 @@ static void eth16i_rx(struct net_device *dev) | |||
| 1164 | else { /* Ok so now we should have a good packet */ | 1164 | else { /* Ok so now we should have a good packet */ |
| 1165 | struct sk_buff *skb; | 1165 | struct sk_buff *skb; |
| 1166 | 1166 | ||
| 1167 | skb = dev_alloc_skb(pkt_len + 3); | 1167 | skb = netdev_alloc_skb(dev, pkt_len + 3); |
| 1168 | if( skb == NULL ) { | 1168 | if( skb == NULL ) { |
| 1169 | printk(KERN_WARNING "%s: Could'n allocate memory for packet (len %d)\n", | 1169 | printk(KERN_WARNING "%s: Could'n allocate memory for packet (len %d)\n", |
| 1170 | dev->name, pkt_len); | 1170 | dev->name, pkt_len); |
diff --git a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c index ee84b472cee6..0230319ddb59 100644 --- a/drivers/net/ethernet/fujitsu/fmvj18x_cs.c +++ b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c | |||
| @@ -1002,7 +1002,7 @@ static void fjn_rx(struct net_device *dev) | |||
| 1002 | dev->stats.rx_errors++; | 1002 | dev->stats.rx_errors++; |
| 1003 | break; | 1003 | break; |
| 1004 | } | 1004 | } |
| 1005 | skb = dev_alloc_skb(pkt_len+2); | 1005 | skb = netdev_alloc_skb(dev, pkt_len + 2); |
| 1006 | if (skb == NULL) { | 1006 | if (skb == NULL) { |
| 1007 | netdev_notice(dev, "Memory squeeze, dropping packet (len %d)\n", | 1007 | netdev_notice(dev, "Memory squeeze, dropping packet (len %d)\n", |
| 1008 | pkt_len); | 1008 | pkt_len); |
