patch-2.3.29 linux/net/802/tr.c

• Lines: 61
• Date: Fri Nov 19 11:33:29 1999
• Orig file: v2.3.28/linux/net/802/tr.c
• Orig date: Mon Nov 1 13:56:27 1999

diff -u --recursive --new-file v2.3.28/linux/net/802/tr.c linux/net/802/tr.c
@@ -189,22 +189,27 @@
 
 	skb_pull(skb,sizeof(struct trh_hdr)-TR_MAXRIFLEN+riflen);
 
-	tr_add_rif_info(trh, dev);
-
-	if(*trh->daddr & 1) 
+	if(*trh->daddr & 0x80) 
 	{
 		if(!memcmp(trh->daddr,dev->broadcast,TR_ALEN)) 	
 			skb->pkt_type=PACKET_BROADCAST;
 		else
 			skb->pkt_type=PACKET_MULTICAST;
 	}
-
+	else if ( (trh->daddr[0] & 0x01) && (trh->daddr[1] & 0x00) && (trh->daddr[2] & 0x5E))
+	{
+		skb->pkt_type=PACKET_MULTICAST;
+	}
 	else if(dev->flags & IFF_PROMISC) 
 	{
 		if(memcmp(trh->daddr, dev->dev_addr, TR_ALEN))
 			skb->pkt_type=PACKET_OTHERHOST;
 	}
 
+	if ((skb->pkt_type != PACKET_BROADCAST) &&
+	    (skb->pkt_type != PACKET_MULTICAST))
+		tr_add_rif_info(trh,dev) ; 
+
 	/*
 	 * Strip the SNAP header from ARP packets since we don't 
 	 * pass them through to the 802.2/SNAP layers.
@@ -231,13 +236,15 @@
 	unsigned int hash;
 	rif_cache entry;
 	unsigned char *olddata;
+	unsigned char mcast_func_addr[] = {0xC0,0x00,0x00,0x04,0x00,0x00};
 	
 	spin_lock_bh(&rif_lock);
 
 	/*
 	 *	Broadcasts are single route as stated in RFC 1042 
 	 */
-	if(!memcmp(&(trh->daddr[0]),&(dev->broadcast[0]),TR_ALEN)) 
+	if( (!memcmp(&(trh->daddr[0]),&(dev->broadcast[0]),TR_ALEN)) ||
+	    (!memcmp(&(trh->daddr[0]),&(mcast_func_addr[0]), TR_ALEN))  )
 	{
 		trh->rcf=htons((((sizeof(trh->rcf)) << 8) & TR_RCF_LEN_MASK)  
 			       | TR_RCF_FRAME2K | TR_RCF_LIMITED_BROADCAST);
@@ -448,9 +455,9 @@
  */
  
 #ifndef CONFIG_PROC_FS
-int rif_get_info(char *buffer,char **start, off_t offset, int length, int dummy)  {}
+static int rif_get_info(char *buffer,char **start, off_t offset, int length)  {}
 #else
-int rif_get_info(char *buffer,char **start, off_t offset, int length, int dummy) 
+static int rif_get_info(char *buffer,char **start, off_t offset, int length) 
 {
 	int len=0;
 	off_t begin=0;