From 995bb2b1a6c4db5fd7f8b3b8a57b92cdc430dd37 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 4 Mar 2008 14:28:50 -0800 Subject: [PATCH] --- yaml --- r: 86803 b: refs/heads/master c: a51f4124e6d69afdfae34a2ff2e580e7bf224ad2 h: refs/heads/master i: 86801: 29ddbdb5a9960b841c45ac7352209c3811f9c42f 86799: 7f4a75d59629b3a772697f8899fd7a0d615c246c v: v3 --- [refs] | 2 +- trunk/drivers/char/pcmcia/ipwireless/network.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 81bf28dcc782..4e949f8eba6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3149be50d3a31df095bcc83d752293da65a37f62 +refs/heads/master: a51f4124e6d69afdfae34a2ff2e580e7bf224ad2 diff --git a/trunk/drivers/char/pcmcia/ipwireless/network.c b/trunk/drivers/char/pcmcia/ipwireless/network.c index ff35230058d3..d793e68b3e0d 100644 --- a/trunk/drivers/char/pcmcia/ipwireless/network.c +++ b/trunk/drivers/char/pcmcia/ipwireless/network.c @@ -377,13 +377,16 @@ void ipwireless_network_packet_received(struct ipw_network *network, for (i = 0; i < MAX_ASSOCIATED_TTYS; i++) { struct ipw_tty *tty = network->associated_ttys[channel_idx][i]; + if (!tty) + continue; + /* * If it's associated with a tty (other than the RAS channel * when we're online), then send the data to that tty. The RAS * channel's data is handled above - it always goes through * ppp_generic. */ - if (tty && channel_idx == IPW_CHANNEL_RAS + if (channel_idx == IPW_CHANNEL_RAS && (network->ras_control_lines & IPW_CONTROL_LINE_DCD) != 0 && ipwireless_tty_is_modem(tty)) {