diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-19 03:52:49 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-19 03:52:49 -0400 |
| commit | 9f7f0098eaadd9200ab52ad0dad523f797d3bf39 (patch) | |
| tree | c91977c79026edbec9da29539f3e0901b3a84db8 /drivers/net/eepro100.c | |
| parent | b4ee21f442ba7a8c43e00b32088d437259890cd0 (diff) | |
| download | talos-obmc-linux-9f7f0098eaadd9200ab52ad0dad523f797d3bf39.tar.gz talos-obmc-linux-9f7f0098eaadd9200ab52ad0dad523f797d3bf39.zip | |
[netdrvr eepro100] check for skb==NULL before calling rx_align(skb)
Diffstat (limited to 'drivers/net/eepro100.c')
| -rw-r--r-- | drivers/net/eepro100.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index 1795425f512e..8c62ced2c9b2 100644 --- a/drivers/net/eepro100.c +++ b/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; |
