patch-2.1.80 linux/drivers/net/shaper.c

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

diff -u --recursive --new-file v2.1.79/linux/drivers/net/shaper.c linux/drivers/net/shaper.c
@@ -254,7 +254,6 @@
 	if(newskb)
 	{
 		newskb->dev=shaper->dev;
-		newskb->arp=1;
 		newskb->priority=2;
 		if(sh_debug)
 			printk("Kick new frame to %s, %d\n",
@@ -448,17 +447,17 @@
 	return v;
 }
 
-static int shaper_cache(struct dst_entry *dst, struct neighbour *neigh, struct hh_cache *hh)
+static int shaper_cache(struct neighbour *neigh, struct hh_cache *hh)
 {
-	struct shaper *sh=dst->dev->priv;
+	struct shaper *sh=neigh->dev->priv;
 	struct device *tmp;
 	int ret;
 	if(sh_debug)
 		printk("Shaper header cache bind\n");
-	tmp=dst->dev;
-	dst->dev=sh->dev;
-	ret=sh->hard_header_cache(dst,neigh,hh);
-	dst->dev=tmp;
+	tmp=neigh->dev;
+	neigh->dev=sh->dev;
+	ret=sh->hard_header_cache(neigh,hh);
+	neigh->dev=tmp;
 	return ret;
 }
 

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