patch-2.1.100 linux/drivers/net/sdla_fr.c

Next file: linux/drivers/net/sdla_x25.c
Previous file: linux/drivers/net/ppp.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.99/linux/drivers/net/sdla_fr.c linux/drivers/net/sdla_fr.c
@@ -831,7 +831,7 @@
 {
 	int hdr_len = 0;
 	skb->protocol = type;
-	hdr_len = wan_encapsulate(skb, dev);
+	hdr_len = wanrouter_encapsulate(skb, dev);
 	if (hdr_len < 0) 
 	{
 		hdr_len = 0;
@@ -1486,7 +1486,7 @@
 		/* Decapsulate packet and pass it up the protocol stack */
 		skb->dev = dev;
 		buf = skb_pull(skb, 1);		/* remove hardware header */
-		if (!wan_type_trans(skb, dev)) 
+		if (!wanrouter_type_trans(skb, dev)) 
 		{
 			/* can't decapsulate packet */
 			dev_kfree_skb(skb);
@@ -1601,7 +1601,7 @@
 					skb->dev = dev;
 					/* remove hardware header */
 					buf = skb_pull(skb, 1);
-					if (!wan_type_trans(skb, dev)) 
+					if (!wanrouter_type_trans(skb, dev)) 
 					{
 						/* can't decapsulate packet */
 						dev_kfree_skb(skb);
@@ -2746,7 +2746,7 @@
 			   stack */
 			new_skb->dev = dev;
 			buf = skb_pull(new_skb, 1);	/* remove hardware header */
-			if (!wan_type_trans(new_skb, dev)) 
+			if (!wanrouter_type_trans(new_skb, dev)) 
 			{
 				++chan->UDP_FPIPE_mgmt_not_passed_to_stack;
 				/* can't decapsulate packet */
@@ -2944,7 +2944,7 @@
 			new_skb->dev = dev;
 			/* remove hardware header */
 			buf = skb_pull(new_skb, 1);
-			if (!wan_type_trans(new_skb, dev)) 
+			if (!wanrouter_type_trans(new_skb, dev)) 
 			{
 				/* can't decapsulate packet */
 				++chan->UDP_DRVSTATS_mgmt_not_passed_to_stack;

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