From 8b657dc5c6e73d2c8500bccb68f9caa4a3466663 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Fri, 19 Aug 2005 03:52:49 -0400 Subject: [PATCH] --- yaml --- r: 6112 b: refs/heads/master c: 9f7f0098eaadd9200ab52ad0dad523f797d3bf39 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/eepro100.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1ca0264f08de..f20e7bbc1fcf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4ee21f442ba7a8c43e00b32088d437259890cd0 +refs/heads/master: 9f7f0098eaadd9200ab52ad0dad523f797d3bf39 diff --git a/trunk/drivers/net/eepro100.c b/trunk/drivers/net/eepro100.c index 1795425f512e..8c62ced2c9b2 100644 --- a/trunk/drivers/net/eepro100.c +++ b/trunk/drivers/net/eepro100.c @@ -1263,8 +1263,8 @@ speedo_init_rx_ring(struct net_device *dev) for (i = 0; i < RX_RING_SIZE; i++) { struct sk_buff *skb; skb = dev_alloc_skb(PKT_BUF_SZ + sizeof(struct RxFD)); - /* XXX: do we really want to call this before the NULL check? --hch */ - rx_align(skb); /* Align IP on 16 byte boundary */ + if (skb) + rx_align(skb); /* Align IP on 16 byte boundary */ sp->rx_skbuff[i] = skb; if (skb == NULL) break; /* OK. Just initially short of Rx bufs. */ @@ -1654,8 +1654,8 @@ static inline struct RxFD *speedo_rx_alloc(struct net_device *dev, int entry) struct sk_buff *skb; /* Get a fresh skbuff to replace the consumed one. */ skb = dev_alloc_skb(PKT_BUF_SZ + sizeof(struct RxFD)); - /* XXX: do we really want to call this before the NULL check? --hch */ - rx_align(skb); /* Align IP on 16 byte boundary */ + if (skb) + rx_align(skb); /* Align IP on 16 byte boundary */ sp->rx_skbuff[entry] = skb; if (skb == NULL) { sp->rx_ringp[entry] = NULL;