[IPV4] net/ipv4: Use ipv4_is_<type> (f97c1e0c) · Commits · e / devices / android_kernel_teracube_emerald

net/ipv4/arp.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -777,7 +777,7 @@ static int arp_process(struct sk_buff *skb)
	* Check for bad requests for 127.x.x.x and requests for multicast		* Check for bad requests for 127.x.x.x and requests for multicast
	* addresses. If this is one such, delete it.		* addresses. If this is one such, delete it.
	*/		*/
	if (LOOPBACK(tip) \|\| MULTICAST(tip))		if (ipv4_is_loopback(tip) \|\| ipv4_is_multicast(tip))
	goto out;		goto out;

	/*		/*

net/ipv4/datagram.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,7 @@ int ip4_datagram_connect(struct sock sk, struct sockaddr uaddr, int addr_len)

	oif = sk->sk_bound_dev_if;		oif = sk->sk_bound_dev_if;
	saddr = inet->saddr;		saddr = inet->saddr;
	if (MULTICAST(usin->sin_addr.s_addr)) {		if (ipv4_is_multicast(usin->sin_addr.s_addr)) {
	if (!oif)		if (!oif)
	oif = inet->mc_index;		oif = inet->mc_index;
	if (!saddr)		if (!saddr)

net/ipv4/devinet.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -404,7 +404,7 @@ static int inet_set_ifa(struct net_device dev, struct in_ifaddr ifa)
	in_dev_hold(in_dev);		in_dev_hold(in_dev);
	ifa->ifa_dev = in_dev;		ifa->ifa_dev = in_dev;
	}		}
	if (LOOPBACK(ifa->ifa_local))		if (ipv4_is_loopback(ifa->ifa_local))
	ifa->ifa_scope = RT_SCOPE_HOST;		ifa->ifa_scope = RT_SCOPE_HOST;
	return inet_insert_ifa(ifa);		return inet_insert_ifa(ifa);
	}		}
	@@ -583,7 +583,7 @@ static __inline__ int inet_abc_len(__be32 addr)
	{		{
	int rc = -1; /* Something else, probably a multicast. */		int rc = -1; /* Something else, probably a multicast. */

	if (ZERONET(addr))		if (ipv4_is_zeronet(addr))
	rc = 0;		rc = 0;
	else {		else {
	__u32 haddr = ntohl(addr);		__u32 haddr = ntohl(addr);

net/ipv4/fib_frontend.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -167,9 +167,9 @@ static inline unsigned __inet_dev_addr_type(const struct net_device *dev,
	unsigned ret = RTN_BROADCAST;		unsigned ret = RTN_BROADCAST;
	struct fib_table *local_table;		struct fib_table *local_table;

	if (ZERONET(addr) \|\| BADCLASS(addr))		if (ipv4_is_zeronet(addr) \|\| ipv4_is_badclass(addr))
	return RTN_BROADCAST;		return RTN_BROADCAST;
	if (MULTICAST(addr))		if (ipv4_is_multicast(addr))
	return RTN_MULTICAST;		return RTN_MULTICAST;

	#ifdef CONFIG_IP_MULTIPLE_TABLES		#ifdef CONFIG_IP_MULTIPLE_TABLES
	@@ -710,7 +710,7 @@ void fib_add_ifaddr(struct in_ifaddr *ifa)
	if (ifa->ifa_broadcast && ifa->ifa_broadcast != htonl(0xFFFFFFFF))		if (ifa->ifa_broadcast && ifa->ifa_broadcast != htonl(0xFFFFFFFF))
	fib_magic(RTM_NEWROUTE, RTN_BROADCAST, ifa->ifa_broadcast, 32, prim);		fib_magic(RTM_NEWROUTE, RTN_BROADCAST, ifa->ifa_broadcast, 32, prim);

	if (!ZERONET(prefix) && !(ifa->ifa_flags&IFA_F_SECONDARY) &&		if (!ipv4_is_zeronet(prefix) && !(ifa->ifa_flags&IFA_F_SECONDARY) &&
	(prefix != addr \|\| ifa->ifa_prefixlen < 32)) {		(prefix != addr \|\| ifa->ifa_prefixlen < 32)) {
	fib_magic(RTM_NEWROUTE, dev->flags&IFF_LOOPBACK ? RTN_LOCAL :		fib_magic(RTM_NEWROUTE, dev->flags&IFF_LOOPBACK ? RTN_LOCAL :
	RTN_UNICAST, prefix, ifa->ifa_prefixlen, prim);		RTN_UNICAST, prefix, ifa->ifa_prefixlen, prim);

net/ipv4/igmp.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1742,7 +1742,7 @@ int ip_mc_join_group(struct sock sk , struct ip_mreqn imr)
	int ifindex;		int ifindex;
	int count = 0;		int count = 0;

	if (!MULTICAST(addr))		if (!ipv4_is_multicast(addr))
	return -EINVAL;		return -EINVAL;

	rtnl_lock();		rtnl_lock();
	@@ -1855,7 +1855,7 @@ int ip_mc_source(int add, int omode, struct sock *sk, struct
	int leavegroup = 0;		int leavegroup = 0;
	int i, j, rv;		int i, j, rv;

	if (!MULTICAST(addr))		if (!ipv4_is_multicast(addr))
	return -EINVAL;		return -EINVAL;

	rtnl_lock();		rtnl_lock();
	@@ -1985,7 +1985,7 @@ int ip_mc_msfilter(struct sock sk, struct ip_msfilter msf, int ifindex)
	struct ip_sf_socklist newpsl, psl;		struct ip_sf_socklist newpsl, psl;
	int leavegroup = 0;		int leavegroup = 0;

	if (!MULTICAST(addr))		if (!ipv4_is_multicast(addr))
	return -EINVAL;		return -EINVAL;
	if (msf->imsf_fmode != MCAST_INCLUDE &&		if (msf->imsf_fmode != MCAST_INCLUDE &&
	msf->imsf_fmode != MCAST_EXCLUDE)		msf->imsf_fmode != MCAST_EXCLUDE)
	@@ -2068,7 +2068,7 @@ int ip_mc_msfget(struct sock sk, struct ip_msfilter msf,
	struct inet_sock *inet = inet_sk(sk);		struct inet_sock *inet = inet_sk(sk);
	struct ip_sf_socklist *psl;		struct ip_sf_socklist *psl;

	if (!MULTICAST(addr))		if (!ipv4_is_multicast(addr))
	return -EINVAL;		return -EINVAL;

	rtnl_lock();		rtnl_lock();
	@@ -2130,7 +2130,7 @@ int ip_mc_gsfget(struct sock sk, struct group_filter gsf,
	if (psin->sin_family != AF_INET)		if (psin->sin_family != AF_INET)
	return -EINVAL;		return -EINVAL;
	addr = psin->sin_addr.s_addr;		addr = psin->sin_addr.s_addr;
	if (!MULTICAST(addr))		if (!ipv4_is_multicast(addr))
	return -EINVAL;		return -EINVAL;

	rtnl_lock();		rtnl_lock();
	@@ -2180,7 +2180,7 @@ int ip_mc_sf_allow(struct sock *sk, __be32 loc_addr, __be32 rmt_addr, int dif)
	struct ip_sf_socklist *psl;		struct ip_sf_socklist *psl;
	int i;		int i;

	if (!MULTICAST(loc_addr))		if (!ipv4_is_multicast(loc_addr))
	return 1;		return 1;

	for (pmc=inet->mc_list; pmc; pmc=pmc->next) {		for (pmc=inet->mc_list; pmc; pmc=pmc->next) {