Skip to content

Commit

Permalink
net: fec: Fix build due to wrong dev annotation
Browse files Browse the repository at this point in the history
commit 21a4e46 (netdev: ethernet dev_alloc_skb to netdev_alloc_skb)
should have used "ndev" instead of "dev".

This causes the following build errors:

drivers/net/ethernet/freescale/fec.c: In function 'fec_enet_rx':
drivers/net/ethernet/freescale/fec.c:714: error: 'dev' undeclared (first use in this function)
drivers/net/ethernet/freescale/fec.c:714: error: (Each undeclared identifier is reported only once
drivers/net/ethernet/freescale/fec.c:714: error: for each function it appears in.)
drivers/net/ethernet/freescale/fec.c: In function 'fec_enet_alloc_buffers':
drivers/net/ethernet/freescale/fec.c:1213: error: 'dev' undeclared (first use in this function)

Fix it, so that fec driver can be built again.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Fabio Estevam authored and David S. Miller committed Feb 7, 2012
1 parent c3059be commit b72061a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/ethernet/freescale/fec.c
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ fec_enet_rx(struct net_device *ndev)
* include that when passing upstream as it messes up
* bridging applications.
*/
skb = netdev_alloc_skb(dev, pkt_len - 4 + NET_IP_ALIGN);
skb = netdev_alloc_skb(ndev, pkt_len - 4 + NET_IP_ALIGN);

if (unlikely(!skb)) {
printk("%s: Memory squeeze, dropping packet.\n",
Expand Down Expand Up @@ -1210,7 +1210,7 @@ static int fec_enet_alloc_buffers(struct net_device *ndev)

bdp = fep->rx_bd_base;
for (i = 0; i < RX_RING_SIZE; i++) {
skb = netdev_alloc_skb(dev, FEC_ENET_RX_FRSIZE);
skb = netdev_alloc_skb(ndev, FEC_ENET_RX_FRSIZE);
if (!skb) {
fec_enet_free_buffers(ndev);
return -ENOMEM;
Expand Down

0 comments on commit b72061a

Please sign in to comment.