patch-2.3.99-pre6 linux/net/x25/x25_in.c

• Lines: 24
• Date: Fri Apr 14 09:38:10 2000
• Orig file: v2.3.99-pre5/linux/net/x25/x25_in.c
• Orig date: Fri Oct 15 15:25:14 1999

diff -u --recursive --new-file v2.3.99-pre5/linux/net/x25/x25_in.c linux/net/x25/x25_in.c
@@ -13,9 +13,11 @@
  *		2 of the License, or (at your option) any later version.
  *
  *	History
- *	X.25 001	Jonathan Naylor	Started coding.
- *	X.25 002	Jonathan Naylor	Centralised disconnection code.
- *					New timer architecture.
+ *	X.25 001	Jonathan Naylor	  Started coding.
+ *	X.25 002	Jonathan Naylor	  Centralised disconnection code.
+ *					  New timer architecture.
+ *	mar/20/00	Daniela Squassoni Disabling/enabling of facilities 
+ *					  negotiation.
  */
 
 #include <linux/config.h>
@@ -111,7 +113,7 @@
 			 */
 			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, &sk->protinfo.x25->facilities));
+			skb_pull(skb, x25_parse_facilities(skb, &sk->protinfo.x25->facilities, &sk->protinfo.x25->vc_facil_mask));
 			/*
 			 *	Copy any Call User Data.
 			 */