1 files changed, 5 insertions, 13 deletions

diff --git a/drivers/tty/ipwireless/network.c b/drivers/tty/ipwireless/network.c
index c0dfb642383..f7daeea598e 100644
--- a/drivers/tty/ipwireless/network.c
+++ b/drivers/tty/ipwireless/network.c
@@ -22,7 +22,7 @@
 #include <linux/ppp_channel.h>
 #include <linux/ppp_defs.h>
 #include <linux/slab.h>
-#include <linux/ppp-ioctl.h>
+#include <linux/if_ppp.h>
 #include <linux/skbuff.h>
 
 #include "network.h"
@@ -274,12 +274,7 @@ static void do_go_online(struct work_struct *work_go_online)
                 network->xaccm[0] = ~0U;
                 network->xaccm[3] = 0x60000000U;
                 network->raccm = ~0U;
-                if (ppp_register_channel(channel) < 0) {
-                        printk(KERN_ERR IPWIRELESS_PCCARD_NAME
-                                        ": unable to register PPP channel\n");
-                        kfree(channel);
-                        return;
-                }
+                ppp_register_channel(channel);
                 spin_lock_irqsave(&network->lock, flags);
                 network->ppp_channel = channel;
         }
@@ -352,8 +347,6 @@ 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);
 
@@ -399,8 +392,7 @@ void ipwireless_network_packet_received(struct ipw_network *network,
 
                                 /* Send the data to the ppp_generic module. */
                                 skb = ipw_packet_received_skb(data, length);
-                                if (skb)
-                                        ppp_input(network->ppp_channel, skb);
+                                ppp_input(network->ppp_channel, skb);
                         } else
                                 spin_unlock_irqrestore(&network->lock,
                                                 flags);
@@ -438,8 +430,8 @@ void ipwireless_network_free(struct ipw_network *network)
         network->shutting_down = 1;
 
         ipwireless_ppp_close(network);
-        flush_work(&network->work_go_online);
-        flush_work(&network->work_go_offline);
+        flush_work_sync(&network->work_go_online);
+        flush_work_sync(&network->work_go_offline);
 
         ipwireless_stop_interrupts(network->hardware);
         ipwireless_associate_network(network->hardware, NULL);