diff options
Diffstat (limited to 'drivers/net/ethernet/micrel/ks8851_mll.c')
-rw-r--r-- | drivers/net/ethernet/micrel/ks8851_mll.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c index e58e78e5c930..61a2f61a31f6 100644 --- a/drivers/net/ethernet/micrel/ks8851_mll.c +++ b/drivers/net/ethernet/micrel/ks8851_mll.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /** | 1 | /** |
2 | * drivers/net/ks8851_mll.c | 2 | * drivers/net/ethernet/micrel/ks8851_mll.c |
3 | * Copyright (c) 2009 Micrel Inc. | 3 | * Copyright (c) 2009 Micrel Inc. |
4 | * | 4 | * |
5 | * This program is free software; you can redistribute it and/or modify | 5 | * This program is free software; you can redistribute it and/or modify |
@@ -796,7 +796,7 @@ static void ks_rcv(struct ks_net *ks, struct net_device *netdev) | |||
796 | 796 | ||
797 | frame_hdr = ks->frame_head_info; | 797 | frame_hdr = ks->frame_head_info; |
798 | while (ks->frame_cnt--) { | 798 | while (ks->frame_cnt--) { |
799 | skb = dev_alloc_skb(frame_hdr->len + 16); | 799 | skb = netdev_alloc_skb(netdev, frame_hdr->len + 16); |
800 | if (likely(skb && (frame_hdr->sts & RXFSHR_RXFV) && | 800 | if (likely(skb && (frame_hdr->sts & RXFSHR_RXFV) && |
801 | (frame_hdr->len < RX_BUF_SIZE) && frame_hdr->len)) { | 801 | (frame_hdr->len < RX_BUF_SIZE) && frame_hdr->len)) { |
802 | skb_reserve(skb, 2); | 802 | skb_reserve(skb, 2); |
@@ -1501,10 +1501,8 @@ static int ks_hw_init(struct ks_net *ks) | |||
1501 | ks->mcast_lst_size = 0; | 1501 | ks->mcast_lst_size = 0; |
1502 | 1502 | ||
1503 | ks->frame_head_info = kmalloc(MHEADER_SIZE, GFP_KERNEL); | 1503 | ks->frame_head_info = kmalloc(MHEADER_SIZE, GFP_KERNEL); |
1504 | if (!ks->frame_head_info) { | 1504 | if (!ks->frame_head_info) |
1505 | pr_err("Error: Fail to allocate frame memory\n"); | ||
1506 | return false; | 1505 | return false; |
1507 | } | ||
1508 | 1506 | ||
1509 | ks_set_mac(ks, KS_DEFAULT_MAC_ADDRESS); | 1507 | ks_set_mac(ks, KS_DEFAULT_MAC_ADDRESS); |
1510 | return true; | 1508 | return true; |