Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f7f0098 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[netdrvr eepro100] check for skb==NULL before calling rx_align(skb)

parent b4ee21f4

drivers/net/eepro100.c

+4 −4
Original line number Diff line number Diff line
@@ -1263,7 +1263,7 @@ 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 */

		if (skb)

			rx_align(skb);        /* Align IP on 16 byte boundary */

		sp->rx_skbuff[i] = skb;

		if (skb == NULL)
@@ -1654,7 +1654,7 @@ 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 */

	if (skb)

		rx_align(skb);		/* Align IP on 16 byte boundary */

	sp->rx_skbuff[entry] = skb;

	if (skb == NULL) {