Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[pandora-kernel.git] / net / ax25 / ax25_iface.c

diff --git a/net/ax25/ax25_iface.c b/net/ax25/ax25_iface.c
index aff3e65..8443af5 100644 (file)
--- a/net/ax25/ax25_iface.c
+++ b/net/ax25/ax25_iface.c
@@ -12,7 +12,6 @@
 #include <linux/in.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/timer.h>
 #include <linux/string.h>
@@ -70,7 +69,6 @@ void ax25_protocol_release(unsigned int pid)
        if (protocol->pid == pid) {
                protocol_list = protocol->next;
                write_unlock_bh(&protocol_list_lock);
-               kfree(protocol);
                return;
        }
 
@@ -79,7 +77,6 @@ void ax25_protocol_release(unsigned int pid)
                        s = protocol->next;
                        protocol->next = protocol->next->next;
                        write_unlock_bh(&protocol_list_lock);
-                       kfree(s);
                        return;
                }