patch-2.1.42 linux/net/x25/x25_in.c

Next file: linux/net/x25/x25_link.c
Previous file: linux/net/x25/x25_facilities.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.41/linux/net/x25/x25_in.c linux/net/x25/x25_in.c
@@ -84,7 +84,6 @@
 static int x25_state1_machine(struct sock *sk, struct sk_buff *skb, int frametype)
 {
 	x25_address source_addr, dest_addr;
-	struct x25_facilities facilities;
 
 	switch (frametype) {
 
@@ -102,9 +101,8 @@
 			 */
 			skb_pull(skb, X25_STD_MIN_LEN);
 			skb_pull(skb, x25_addr_ntoa(skb->data, &source_addr, &dest_addr));
-			skb_pull(skb, x25_parse_facilities(skb, &facilities));
+			skb_pull(skb, x25_parse_facilities(skb, &sk->protinfo.x25->facilities));
 			/*
-			 *	Facilities XXX
 			 *	Copy any Call User Data.
 			 */
 			if (skb->len >= 0) {
@@ -128,7 +126,6 @@
 			break;
 
 		default:
-			printk(KERN_WARNING "x25: unknown %02X in state 1\n", frametype);
 			break;
 	}
 
@@ -158,7 +155,6 @@
 			break;
 
 		default:
-			printk(KERN_WARNING "x25: unknown %02X in state 2\n", frametype);
 			break;
 	}
 
@@ -334,7 +330,6 @@
 			break;
 
 		default:
-			printk(KERN_WARNING "x25: unknown %02X in state 4\n", frametype);
 			break;
 	}
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov