lkml.org 
[lkml]   [2006]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 34/37] sky2: use dev_alloc_skb for receive buffers
    -stable review patch.  If anyone has any objections, please let us know.

    ------------------
    From: Stephen Hemminger <shemminger@osdl.org>

    Several code paths assume an additional 16 bytes of header padding
    on the receive path. Use dev_alloc_skb to get that padding.

    Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/sky2.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- linux-2.6.17.11.orig/drivers/net/sky2.c
    +++ linux-2.6.17.11/drivers/net/sky2.c
    @@ -949,14 +949,14 @@ static void sky2_vlan_rx_kill_vid(struct
    /*
    * It appears the hardware has a bug in the FIFO logic that
    * cause it to hang if the FIFO gets overrun and the receive buffer
    - * is not aligned. ALso alloc_skb() won't align properly if slab
    + * is not aligned. Also dev_alloc_skb() won't align properly if slab
    * debugging is enabled.
    */
    static inline struct sk_buff *sky2_alloc_skb(unsigned int size, gfp_t gfp_mask)
    {
    struct sk_buff *skb;

    - skb = alloc_skb(size + RX_SKB_ALIGN, gfp_mask);
    + skb = __dev_alloc_skb(size + RX_SKB_ALIGN, gfp_mask);
    if (likely(skb)) {
    unsigned long p = (unsigned long) skb->data;
    skb_reserve(skb, ALIGN(p, RX_SKB_ALIGN) - p);
    @@ -1855,7 +1855,7 @@ static struct sk_buff *sky2_receive(stru
    goto oversize;

    if (length < copybreak) {
    - skb = alloc_skb(length + 2, GFP_ATOMIC);
    + skb = dev_alloc_skb(length + 2);
    if (!skb)
    goto resubmit;

    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-09-07 01:09    [W:7.014 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site