## Automatically generated incremental diff
## From:   linux-2.2.22-rc3
## To:     linux-2.2.22
## Robot:  $Id: make-incremental-diff,v 1.11 2002/02/20 02:59:33 hpa Exp $

diff -urN linux-2.2.22-rc3/Makefile linux-2.2.22/Makefile
--- linux-2.2.22-rc3/Makefile	Mon Sep 16 09:33:21 2002
+++ linux-2.2.22/Makefile	Mon Sep 16 09:33:23 2002
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 2
 SUBLEVEL = 22
-EXTRAVERSION = rc3
+EXTRAVERSION = 
 
 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
 
diff -urN linux-2.2.22-rc3/drivers/net/hdlc.c linux-2.2.22/drivers/net/hdlc.c
--- linux-2.2.22-rc3/drivers/net/hdlc.c	Sun Mar 25 08:31:22 2001
+++ linux-2.2.22/drivers/net/hdlc.c	Mon Sep 16 09:33:23 2002
@@ -19,6 +19,13 @@
  *
  * Use sethdlc utility to set line parameters, protocol and PVCs
  */
+ /*
+   Patched by Pavel Selivanov. 08 Aug. 2001
+   If we are using dev_queue_xmit, and we have a listeners,
+   we should set skb->nh.raw. If no, we'll get a lot of warnings in 
+   /var/log/debug
+   Look at core/net/dev.c dev_queue_xmit_nit  
+*/
 
 #include <linux/config.h>
 #include <linux/module.h>
@@ -103,6 +110,7 @@
 	skb_put(skb, sizeof(cisco_packet));
 	skb->priority=TC_PRIO_CONTROL;
 	skb->dev = hdlc_to_dev(hdlc);
+	skb->nh.raw = skb->data;
 	
 	dev_queue_xmit(skb);
 }
@@ -384,7 +392,8 @@
 	skb_put(skb, i);
 	skb->priority=TC_PRIO_CONTROL;
 	skb->dev = hdlc_to_dev(hdlc);
-
+	skb->nh.raw = skb->data;
+	
 	dev_queue_xmit(skb);
 }
 
@@ -820,6 +829,7 @@
 {
 	pvc_device *pvc=dev_to_pvc(dev);
 
+	skb->nh.raw = skb->data;
 	if (pvc->state & PVC_STATE_ACTIVE) {
 		skb->dev = hdlc_to_dev(pvc->master);
 		pvc->stats.tx_bytes+=skb->len;
diff -urN linux-2.2.22-rc3/drivers/net/syncppp.c linux-2.2.22/drivers/net/syncppp.c
--- linux-2.2.22-rc3/drivers/net/syncppp.c	Fri Nov  2 08:39:07 2001
+++ linux-2.2.22/drivers/net/syncppp.c	Mon Sep 16 09:33:23 2002
@@ -16,7 +16,14 @@
  *
  *	Port for Linux-2.1 by Jan "Yenya" Kasprzak <kas@fi.muni.cz>
  */
-
+ /*
+  Patched by Pavel Selivanov. 08 Aug. 2001
+  If we are using dev_queue_xmit, and we have a listeners,
+  we should set skb->nh.raw. If no, we'll get a lot of warnings in
+  /var/log/debug
+  Look at core/net/dev.c dev_queue_xmit_nit
+*/
+				
 /*
  * Synchronous PPP/Cisco link level subroutines.
  * Keepalive protocol implemented in both Cisco and PPP modes.
@@ -781,6 +788,8 @@
 	/* Control is high priority so it doesnt get queued behind data */
 	skb->priority=TC_PRIO_CONTROL;
 	skb->dev = dev;
+	skb->nh.raw = skb->data;
+	
 	dev_queue_xmit(skb);
 }
 
@@ -823,6 +832,8 @@
 	sp->obytes += skb->len;
 	skb->priority=TC_PRIO_CONTROL;
 	skb->dev = dev;
+	skb->nh.raw = skb->data;
+	
 	dev_queue_xmit(skb);
 }
 
