: 2.6.8.1, additional options for embedded systems

108 lines not on this page · raw message

diff -Naur -X ./patt ./linux-2.6.8.1/net/ipv4/af_inet.c ./linux-2.6.8.1_new/net/ipv4/af_inet.c
@@ -379,8 +379,9 @@
 		long timeout;
 
 		/* Applications forget to leave groups before exiting */
+#ifdef CONFIG_IP_IGMP
 		ip_mc_drop_socket(sk);
-
+#endif
 		/* If linger is set, we don't return until the close
 		 * is complete.  Otherwise we return immediately. The
 		 * actually closing is done the same either way.

diff -Naur -X ./patt ./linux-2.6.8.1/net/ipv4/devinet.c ./linux-2.6.8.1_new/net/ipv4/devinet.c
@@ -165,9 +165,11 @@
 #ifdef CONFIG_SYSCTL
 	devinet_sysctl_register(in_dev, &in_dev->cnf);
 #endif
+#ifdef CONFIG_IP_IGMP
 	ip_mc_init_dev(in_dev);
 	if (dev->flags & IFF_UP)
 		ip_mc_up(in_dev);
+#endif
 out:
 	return in_dev;
 out_kfree:

@@ -184,7 +186,9 @@
 
 	in_dev->dead = 1;
 
+#ifdef CONFIG_IP_IGMP
 	ip_mc_destroy_dev(in_dev);
+#endif
 
 	while ((ifa = in_dev->ifa_list) != NULL) {
 		inet_del_ifa(in_dev, &in_dev->ifa_list, 0);

@@ -981,10 +985,14 @@
 			in_dev->cnf.no_xfrm = 1;
 			in_dev->cnf.no_policy = 1;
 		}
+#ifdef CONFIG_IP_IGMP
 		ip_mc_up(in_dev);
+#endif
 		break;
 	case NETDEV_DOWN:
+#ifdef CONFIG_IP_IGMP
 		ip_mc_down(in_dev);
+#endif
 		break;
 	case NETDEV_CHANGEMTU:
 		if (dev->mtu >= 68)

diff -Naur -X ./patt ./linux-2.6.8.1/net/ipv4/ip_sockglue.c ./linux-2.6.8.1_new/net/ipv4/ip_sockglue.c
@@ -523,6 +523,9 @@
 			if (!val)
 				skb_queue_purge(&sk->sk_error_queue);
 			break;
+
+#ifdef CONFIG_IP_IGMP
+
 		case IP_MULTICAST_TTL:
 			if (sk->sk_type == SOCK_STREAM)
 				goto e_inval;

@@ -839,6 +842,9 @@
 				kfree(gsf);
 			break;
 		}
+
+#endif
+
 		case IP_ROUTER_ALERT:	
 			err = ip_ra_control(sk, val ? 1 : 0, NULL);
 			break;

@@ -970,6 +976,9 @@
 		case IP_RECVERR:
 			val = inet->recverr;
 			break;
+
+#ifdef CONFIG_IP_IGMP
+
 		case IP_MULTICAST_TTL:
 			val = inet->mc_ttl;
 			break;

@@ -1025,6 +1034,9 @@
 			release_sock(sk);
 			return err;
 		}
+
+#endif
+
 		case IP_PKTOPTIONS:		
 		{
 			struct msghdr msg;

diff -Naur -X ./patt ./linux-2.6.8.1/net/ipv4/route.c ./linux-2.6.8.1_new/net/ipv4/route.c
@@ -1453,6 +1453,8 @@
         rt->rt_type = res->type;
 }
 
+#ifdef CONFIG_IP_IGMP
+
 static int ip_route_input_mc(struct sk_buff *skb, u32 daddr, u32 saddr,
 				u8 tos, struct net_device *dev, int our)
 {

@@ -1538,6 +1540,8 @@
 	return -EINVAL;
 }
 
+#endif
+
 /*
  *	NOTE. We drop all the packets that has local source
  *	addresses, because every properly looped back packet

@@ -1898,6 +1902,9 @@
 	   route cache entry is created eventually.
 	 */
 	if (MULTICAST(daddr)) {
+
+#ifdef CONFIG_IP_IGMP
+
 		struct in_device *in_dev;
 
 		read_lock(&inetdev_lock);

@@ -1915,6 +1922,9 @@
 			}
 		}
 		read_unlock(&inetdev_lock);
+
+#endif
+
 		return -EINVAL;
 	}
 	return ip_route_input_slow(skb, daddr, saddr, tos, dev);

@@ -2131,7 +2141,11 @@
 			fib_info_put(res.fi);
 			res.fi = NULL;
 		}
-	} else if (res.type == RTN_MULTICAST) {
+	}
+	
+#ifdef CONFIG_IP_IGMP
+	
+	else if (res.type == RTN_MULTICAST) {
 		flags |= RTCF_MULTICAST|RTCF_LOCAL;
 		if (!ip_check_mc(in_dev, oldflp->fl4_dst, oldflp->fl4_src, oldflp->proto))
 			flags &= ~RTCF_LOCAL;

@@ -2145,6 +2159,8 @@
 		}
 	}
 
+#endif
+
 	rth = dst_alloc(&ipv4_dst_ops);
 	if (!rth)
 		goto e_nobufs;

diff -Naur -X ./patt ./linux-2.6.8.1/net/ipv4/udp.c ./linux-2.6.8.1_new/net/ipv4/udp.c
@@ -275,6 +275,8 @@
 	return sk;
 }
 
+#ifdef CONFIG_IP_IGMP
+
 static inline struct sock *udp_v4_mcast_next(struct sock *sk,
 					     u16 loc_port, u32 loc_addr,
 					     u16 rmt_port, u32 rmt_addr,

@@ -303,6 +305,8 @@
   	return s;
 }
 
+#endif
+
 /*
  * This routine is called by the ICMP module when it gets some
  * sort of error condition.  If err < 0 then the socket should

@@ -1040,6 +1044,8 @@
 	return 0;
 }
 
+#ifdef CONFIG_IP_IGMP
+
 /*
  *	Multicasts and broadcasts go to each listener.
  *

@@ -1082,6 +1088,8 @@
 	return 0;
 }
 
+#endif
+
 /* Initialize UDP checksum. If exited with zero value (success),
  * CHECKSUM_UNNECESSARY means, that no more checks are required.
  * Otherwise, csum completion requires chacksumming packet body,

@@ -1116,7 +1124,6 @@
   	struct sock *sk;
   	struct udphdr *uh;
 	unsigned short ulen;
-	struct rtable *rt = (struct rtable*)skb->dst;
 	u32 saddr = skb->nh.iph->saddr;
 	u32 daddr = skb->nh.iph->daddr;
 	int len = skb->len;

@@ -1140,9 +1147,14 @@
 	if (udp_checksum_init(skb, uh, ulen, saddr, daddr) < 0)
 		goto csum_error;
 
+#ifdef CONFIG_IP_IGMP
+
+	struct rtable *rt = (struct rtable*)skb->dst;
 	if(rt->rt_flags & (RTCF_BROADCAST|RTCF_MULTICAST))
 		return udp_v4_mcast_deliver(skb, uh, saddr, daddr);
 
+#endif
+
 	sk = udp_v4_lookup(saddr, uh->source, daddr, uh->dest, skb->dev->ifindex);
 
 	if (sk != NULL) {