patch-2.1.67 linux/net/appletalk/aarp.c

• Lines: 113
• Date: Sat Nov 29 10:41:10 1997
• Orig file: v2.1.66/linux/net/appletalk/aarp.c
• Orig date: Tue Sep 23 16:48:50 1997

diff -u --recursive --new-file v2.1.66/linux/net/appletalk/aarp.c linux/net/appletalk/aarp.c
@@ -157,7 +157,6 @@
 	 *	Send it.
 	 */	
 	
-	skb->priority = SOPRI_NORMAL; 
 	dev_queue_xmit(skb);
 	
 	/*
@@ -219,7 +218,6 @@
 	/*
 	 *	Send it.
 	 */	
-	skb->priority = SOPRI_NORMAL;
 	dev_queue_xmit(skb);
 	
 }
@@ -279,7 +277,6 @@
 	/*
 	 *	Send it.
 	 */	
-	skb->priority = SOPRI_NORMAL; 
 	dev_queue_xmit(skb);
 	
 }
@@ -433,10 +430,13 @@
 	struct aarp_entry *a;
 	unsigned long flags;
 	
+	skb->nh.raw=skb->data;
+	
 	/*
 	 *	Check for localtalk first
 	 */
 	 
+	 
 	if(dev->type==ARPHRD_LOCALTLK)
 	{
 		struct at_addr *at=atalk_find_dev_addr(dev);
@@ -472,9 +472,7 @@
 		skb->data[1]=at->s_node;
 		skb->data[2]=ft;
 		 
-		if(skb->sk==NULL)
-			skb->priority = SOPRI_NORMAL;
-		else
+		if(skb->sk)
 			skb->priority = skb->sk->priority;
 		skb->dev = dev;
 		dev_queue_xmit(skb);
@@ -487,9 +485,7 @@
 	if(dev->type==ARPHRD_PPP)
 	{
 		skb->protocol = htons(ETH_P_PPPTALK);
-		if(skb->sk==NULL)
-			skb->priority = SOPRI_NORMAL;
-		else
+		if(skb->sk)
 			skb->priority = skb->sk->priority;
 		skb->dev = dev;
 		dev_queue_xmit(skb);
@@ -519,9 +515,7 @@
 	if(sa->s_node==ATADDR_BCAST)
 	{
 		ddp_dl->datalink_header(ddp_dl, skb, ddp_eth_multicast);
-		if(skb->sk==NULL)
-			skb->priority = SOPRI_NORMAL;
-		else
+		if(skb->sk)
 			skb->priority = skb->sk->priority;
 		dev_queue_xmit(skb);
 		restore_flags(flags);
@@ -536,9 +530,7 @@
 
 		a->expires_at=jiffies+sysctl_aarp_expiry_time*10;
 		ddp_dl->datalink_header(ddp_dl, skb, a->hwaddr);
-		if(skb->sk==NULL)
-			skb->priority = SOPRI_NORMAL;
-		else
+		if(skb->sk)
 			skb->priority = skb->sk->priority;
 		dev_queue_xmit(skb);
 		restore_flags(flags);
@@ -644,9 +636,7 @@
 			{
 				a->expires_at=jiffies+sysctl_aarp_expiry_time*10;
 				ddp_dl->datalink_header(ddp_dl,skb,a->hwaddr);
-				if(skb->sk==NULL)
-					skb->priority = SOPRI_NORMAL;
-				else
+				if(skb->sk)
 					skb->priority = skb->sk->priority;
 				dev_queue_xmit(skb);
 			}
@@ -828,11 +818,9 @@
 }
 
 
-#ifdef MODULE
 
 /*
  * Remove the AARP entries associated with a device.
- * Called from cleanup_module() in ddp.c.
  */
 void aarp_device_down(struct device *dev)
 {
@@ -847,6 +835,7 @@
 	return;
 }
 
+#ifdef MODULE
 /*
  * General module cleanup. Called from cleanup_module() in ddp.c.
  */