vserver 1.9.5.x5

[linux-2.6.git] / net / x25 / x25_dev.c

diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c
index f58aa65..36fc3bf 100644 (file)
--- a/net/x25/x25_dev.c
+++ b/net/x25/x25_dev.c
@@ -18,29 +18,10 @@
  */
 
 #include <linux/config.h>
-#include <linux/errno.h>
-#include <linux/types.h>
-#include <linux/socket.h>
-#include <linux/in.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/string.h>
-#include <linux/sockios.h>
-#include <linux/net.h>
-#include <linux/stat.h>
-#include <linux/inet.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <net/sock.h>
-#include <asm/system.h>
-#include <asm/uaccess.h>
-#include <linux/fcntl.h>
-#include <linux/termios.h>     /* For TIOCINQ/OUTQ */
-#include <linux/mm.h>
-#include <linux/interrupt.h>
-#include <linux/notifier.h>
-#include <linux/proc_fs.h>
 #include <linux/if_arp.h>
 #include <net/x25.h>
 
@@ -92,7 +73,9 @@ static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *nb)
 /*
        x25_transmit_clear_request(nb, lci, 0x0D);
 */
-       printk(KERN_DEBUG "x25_receive_data(): unknown frame type %2x\n",frametype);
+
+       if (frametype != X25_CLEAR_CONFIRMATION)
+               printk(KERN_DEBUG "x25_receive_data(): unknown frame type %2x\n",frametype);
 
        return 0;
 }
@@ -140,29 +123,6 @@ out:
        return 0;
 }
 
-int x25_llc_receive_frame(struct sk_buff *skb, struct net_device *dev,
-                         struct packet_type *ptype)
-{
-       struct x25_neigh *nb;
-       int rc = 0;
-
-       skb->sk = NULL;
-
-       /*
-        * Packet received from unrecognised device, throw it away.
-        */
-       nb = x25_get_neigh(dev);
-       if (!nb) {
-               printk(KERN_DEBUG "X.25: unknown_neighbour - %s\n", dev->name);
-               kfree_skb(skb);
-       } else {
-               rc = x25_receive_data(skb, nb);
-               x25_neigh_put(nb);
-       }
-
-       return rc;
-}
-
 void x25_establish_link(struct x25_neigh *nb)
 {
        struct sk_buff *skb;