From d2a1006dd2e3790ed409a3960fa0738f06585e1d Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 23 Mar 2006 11:07:24 -0800 Subject: [PATCH] --- yaml --- r: 23311 b: refs/heads/master c: b5d56ddc3f839e94e97a3eb8afb4d0d64a9f2ef8 h: refs/heads/master i: 23309: ce1c887ae53b752049f11ed4569cf0d1760bc26b 23307: a43833ac868b5d62fd4373e031c3e1109339502e 23303: 35506f85a34370f87c46bf4cf721227a59f78977 23295: 5aa4f19cf969088ec4ddf035d842a69fb6ece6a0 v: v3 --- [refs] | 2 +- trunk/drivers/net/skge.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7e144cb7a668..30f137fe95c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 901ccefb2dd7fe6a9e750a68f990f2a7d76b78d2 +refs/heads/master: b5d56ddc3f839e94e97a3eb8afb4d0d64a9f2ef8 diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c index 89a6252ac7cc..b0aa150bbd8a 100644 --- a/trunk/drivers/net/skge.c +++ b/trunk/drivers/net/skge.c @@ -829,7 +829,7 @@ static int skge_rx_fill(struct skge_port *skge) do { struct sk_buff *skb; - skb = dev_alloc_skb(skge->rx_buf_size + NET_IP_ALIGN); + skb = alloc_skb(skge->rx_buf_size + NET_IP_ALIGN, GFP_KERNEL); if (!skb) return -ENOMEM; @@ -2592,7 +2592,7 @@ static inline struct sk_buff *skge_rx_get(struct skge_port *skge, goto error; if (len < RX_COPY_THRESHOLD) { - skb = dev_alloc_skb(len + 2); + skb = alloc_skb(len + 2, GFP_ATOMIC); if (!skb) goto resubmit; @@ -2607,7 +2607,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 = dev_alloc_skb(skge->rx_buf_size + NET_IP_ALIGN); + nskb = alloc_skb(skge->rx_buf_size + NET_IP_ALIGN, GFP_ATOMIC); if (!nskb) goto resubmit;