diff options
Diffstat (limited to 'drivers/tty/ipwireless')
| -rw-r--r-- | drivers/tty/ipwireless/network.c | 5 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/setup_protocol.h | 2 | ||||
| -rw-r--r-- | drivers/tty/ipwireless/tty.c | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/drivers/tty/ipwireless/network.c b/drivers/tty/ipwireless/network.c index 57102e66165a..c0dfb642383b 100644 --- a/drivers/tty/ipwireless/network.c +++ b/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); diff --git a/drivers/tty/ipwireless/setup_protocol.h b/drivers/tty/ipwireless/setup_protocol.h index 9d6bcc77c73c..002c34e72521 100644 --- a/drivers/tty/ipwireless/setup_protocol.h +++ b/drivers/tty/ipwireless/setup_protocol.h @@ -59,7 +59,7 @@ struct tl_setup_config_done_msg { unsigned char sig_no; /* TL_SETUP_SIGNO_CONFIG_DONE_MSG */ } __attribute__ ((__packed__)); -/* Asyncronous messages */ +/* Asynchronous messages */ struct tl_setup_open_msg { unsigned char sig_no; /* TL_SETUP_SIGNO_OPEN_MSG */ unsigned char port_no; diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c index 160f0ad9589d..2cde13ddf9fc 100644 --- a/drivers/tty/ipwireless/tty.c +++ b/drivers/tty/ipwireless/tty.c @@ -566,6 +566,7 @@ void ipwireless_tty_free(struct ipw_tty *tty) ipwireless_disassociate_network_ttys(network, ttyj->channel_idx); tty_unregister_device(ipw_tty_driver, j); + tty_port_destroy(&ttyj->port); ttys[j] = NULL; mutex_unlock(&ttyj->ipw_tty_mutex); kfree(ttyj); |