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 | |
| parent | b4ee21f442ba7a8c43e00b32088d437259890cd0 (diff) | |
[netdrvr eepro100] check for skb==NULL before calling rx_align(skb)
Diffstat (limited to 'drivers')
| -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 1795425f512..8c62ced2c9b 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c | |||
| @@ -1263,8 +1263,8 @@ speedo_init_rx_ring(struct net_device *dev) | |||
| 1263 | for (i = 0; i < RX_RING_SIZE; i++) { | 1263 | for (i = 0; i < RX_RING_SIZE; i++) { |
| 1264 | struct sk_buff *skb; | 1264 | struct sk_buff *skb; |
| 1265 | skb = dev_alloc_skb(PKT_BUF_SZ + sizeof(struct RxFD)); | 1265 | skb = dev_alloc_skb(PKT_BUF_SZ + sizeof(struct RxFD)); |
| 1266 | /* XXX: do we really want to call this before the NULL check? --hch */ | 1266 | if (skb) |
| 1267 | rx_align(skb); /* Align IP on 16 byte boundary */ | 1267 | rx_align(skb); /* Align IP on 16 byte boundary */ |
| 1268 | sp->rx_skbuff[i] = skb; | 1268 | sp->rx_skbuff[i] = skb; |
| 1269 | if (skb == NULL) | 1269 | if (skb == NULL) |
| 1270 | break; /* OK. Just initially short of Rx bufs. */ | 1270 | 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) | |||
| 1654 | struct sk_buff *skb; | 1654 | struct sk_buff *skb; |
| 1655 | /* Get a fresh skbuff to replace the consumed one. */ | 1655 | /* Get a fresh skbuff to replace the consumed one. */ |
| 1656 | skb = dev_alloc_skb(PKT_BUF_SZ + sizeof(struct RxFD)); | 1656 | skb = dev_alloc_skb(PKT_BUF_SZ + sizeof(struct RxFD)); |
| 1657 | /* XXX: do we really want to call this before the NULL check? --hch */ | 1657 | if (skb) |
| 1658 | rx_align(skb); /* Align IP on 16 byte boundary */ | 1658 | rx_align(skb); /* Align IP on 16 byte boundary */ |
| 1659 | sp->rx_skbuff[entry] = skb; | 1659 | sp->rx_skbuff[entry] = skb; |
| 1660 | if (skb == NULL) { | 1660 | if (skb == NULL) { |
| 1661 | sp->rx_ringp[entry] = NULL; | 1661 | sp->rx_ringp[entry] = NULL; |