From 2fe9d7757c6b7ec71eca2664037e28bb8c5b5c16 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 28 Aug 2006 16:19:37 -0700 Subject: [PATCH] --- yaml --- r: 35193 b: refs/heads/master c: 83c758fabd3589842ebcb3af6b9150ff55bc39aa h: refs/heads/master i: 35191: e951db67803b44a1b30976f68f976173245eb7bc v: v3 --- [refs] | 2 +- trunk/drivers/net/skge.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d5aea9ef87d6..ea7b1b174bcb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78bc218663e3bd6cbbaf6a363d2f88f17541adfb +refs/heads/master: 83c758fabd3589842ebcb3af6b9150ff55bc39aa diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c index 85296ba5eac2..e38b178769c2 100644 --- a/trunk/drivers/net/skge.c +++ b/trunk/drivers/net/skge.c @@ -827,7 +827,8 @@ static int skge_rx_fill(struct skge_port *skge) do { struct sk_buff *skb; - skb = alloc_skb(skge->rx_buf_size + NET_IP_ALIGN, GFP_KERNEL); + skb = __dev_alloc_skb(skge->rx_buf_size + NET_IP_ALIGN, + GFP_KERNEL); if (!skb) return -ENOMEM; @@ -2609,7 +2610,7 @@ static inline struct sk_buff *skge_rx_get(struct skge_port *skge, goto error; if (len < RX_COPY_THRESHOLD) { - skb = alloc_skb(len + 2, GFP_ATOMIC); + skb = dev_alloc_skb(len + 2); if (!skb) goto resubmit; @@ -2624,7 +2625,7 @@ static inline struct sk_buff *skge_rx_get(struct skge_port *skge, skge_rx_reuse(e, skge->rx_buf_size); } else { struct sk_buff *nskb; - nskb = alloc_skb(skge->rx_buf_size + NET_IP_ALIGN, GFP_ATOMIC); + nskb = dev_alloc_skb(skge->rx_buf_size + NET_IP_ALIGN); if (!nskb) goto resubmit;