diff --git a/[refs] b/[refs] index 500f84198553..23691da1ae78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4bd82136cdf04f3a8d50e20c1b76da750f75f2db +refs/heads/master: d1519e23c2b3a518fb41daf3eceae43382433ceb diff --git a/trunk/drivers/tty/ipwireless/network.c b/trunk/drivers/tty/ipwireless/network.c index 57102e66165a..c0dfb642383b 100644 --- a/trunk/drivers/tty/ipwireless/network.c +++ b/trunk/drivers/tty/ipwireless/network.c @@ -352,6 +352,8 @@ static struct sk_buff *ipw_packet_received_skb(unsigned char *data, } skb = dev_alloc_skb(length + 4); + if (skb == NULL) + return NULL; skb_reserve(skb, 2); memcpy(skb_put(skb, length), data, length); @@ -397,7 +399,8 @@ void ipwireless_network_packet_received(struct ipw_network *network, /* Send the data to the ppp_generic module. */ skb = ipw_packet_received_skb(data, length); - ppp_input(network->ppp_channel, skb); + if (skb) + ppp_input(network->ppp_channel, skb); } else spin_unlock_irqrestore(&network->lock, flags);