Commit 4bc2f18b authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net/ipv4: EXPORT_SYMBOL cleanups 



CodingStyle cleanups

EXPORT_SYMBOL should immediately follow the symbol declaration.

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba80a252

net/ipv4/arp.c

+7 −11
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ 
#if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE)

#include <net/atmclip.h>

struct neigh_table *clip_tbl_hook;

EXPORT_SYMBOL(clip_tbl_hook);

#endif



#include <asm/system.h>
@@ -169,6 +170,7 @@ const struct neigh_ops arp_broken_ops = { 
	.hh_output =		dev_queue_xmit,

	.queue_xmit =		dev_queue_xmit,

};

EXPORT_SYMBOL(arp_broken_ops);



struct neigh_table arp_tbl = {

	.family =	AF_INET,
@@ -198,6 +200,7 @@ struct neigh_table arp_tbl = { 
	.gc_thresh2 =	512,

	.gc_thresh3 =	1024,

};

EXPORT_SYMBOL(arp_tbl);



int arp_mc_map(__be32 addr, u8 *haddr, struct net_device *dev, int dir)

{
@@ -499,6 +502,7 @@ int arp_find(unsigned char *haddr, struct sk_buff *skb) 
		kfree_skb(skb);

	return 1;

}

EXPORT_SYMBOL(arp_find);



/* END OF OBSOLETE FUNCTIONS */
@@ -700,6 +704,7 @@ struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip, 
	kfree_skb(skb);

	return NULL;

}

EXPORT_SYMBOL(arp_create);



/*

 *	Send an arp packet.
@@ -709,6 +714,7 @@ void arp_xmit(struct sk_buff *skb) 
	/* Send it off, maybe filter it using firewalling first.  */

	NF_HOOK(NFPROTO_ARP, NF_ARP_OUT, skb, NULL, skb->dev, dev_queue_xmit);

}

EXPORT_SYMBOL(arp_xmit);



/*

 *	Create and send an arp packet.
@@ -735,6 +741,7 @@ void arp_send(int type, int ptype, __be32 dest_ip, 


	arp_xmit(skb);

}

EXPORT_SYMBOL(arp_send);



/*

 *	Process an arp request.
@@ -1452,14 +1459,3 @@ static int __init arp_proc_init(void) 
}



#endif /* CONFIG_PROC_FS */
 


EXPORT_SYMBOL(arp_broken_ops);

EXPORT_SYMBOL(arp_find);

EXPORT_SYMBOL(arp_create);

EXPORT_SYMBOL(arp_xmit);

EXPORT_SYMBOL(arp_send);

EXPORT_SYMBOL(arp_tbl);



#if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE)

EXPORT_SYMBOL(clip_tbl_hook);

#endif

net/ipv4/datagram.c

+0 −2
Original line number Diff line number Diff line
@@ -72,6 +72,4 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
	sk_dst_set(sk, &rt->dst);

	return(0);

}



EXPORT_SYMBOL(ip4_datagram_connect);

net/ipv4/fib_frontend.c

+3 −4
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ struct net_device * ip_dev_find(struct net *net, __be32 addr) 
	fib_res_put(&res);

	return dev;

}

EXPORT_SYMBOL(ip_dev_find);



/*

 * Find address type as if only "dev" was present in the system. If
@@ -214,12 +215,14 @@ unsigned int inet_addr_type(struct net *net, __be32 addr) 
{

	return __inet_dev_addr_type(net, NULL, addr);

}

EXPORT_SYMBOL(inet_addr_type);



unsigned int inet_dev_addr_type(struct net *net, const struct net_device *dev,

				__be32 addr)

{

       return __inet_dev_addr_type(net, dev, addr);

}

EXPORT_SYMBOL(inet_dev_addr_type);



/* Given (packet source, input interface) and optional (dst, oif, tos):

   - (main) check, that source is valid i.e. not broadcast or our local
@@ -1077,7 +1080,3 @@ void __init ip_fib_init(void) 


	fib_hash_init();

}
 


EXPORT_SYMBOL(inet_addr_type);

EXPORT_SYMBOL(inet_dev_addr_type);

EXPORT_SYMBOL(ip_dev_find);

net/ipv4/icmp.c

+3 −4
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ const struct icmp_err icmp_err_convert[] = { 
		.fatal = 1,

	},

};

EXPORT_SYMBOL(icmp_err_convert);



/*

 *	ICMP control array. This specifies what to do with each ICMP.
@@ -267,6 +268,7 @@ int xrlim_allow(struct dst_entry *dst, int timeout) 
	dst->rate_tokens = token;

	return rc;

}

EXPORT_SYMBOL(xrlim_allow);



static inline int icmpv4_xrlim_allow(struct net *net, struct rtable *rt,

		int type, int code)
@@ -647,6 +649,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) 
	icmp_xmit_unlock(sk);

out:;

}

EXPORT_SYMBOL(icmp_send);





/*
@@ -1214,7 +1217,3 @@ int __init icmp_init(void) 
{

	return register_pernet_subsys(&icmp_sk_ops);

}
 


EXPORT_SYMBOL(icmp_err_convert);

EXPORT_SYMBOL(icmp_send);

EXPORT_SYMBOL(xrlim_allow);

net/ipv4/igmp.c

+4 −5
Original line number Diff line number Diff line
@@ -1244,6 +1244,7 @@ void ip_mc_inc_group(struct in_device *in_dev, __be32 addr) 
out:

	return;

}

EXPORT_SYMBOL(ip_mc_inc_group);



/*

 *	Resend IGMP JOIN report; used for bonding.
@@ -1266,6 +1267,7 @@ void ip_mc_rejoin_group(struct ip_mc_list *im) 
	igmp_ifc_event(in_dev);

#endif

}

EXPORT_SYMBOL(ip_mc_rejoin_group);



/*

 *	A socket has left a multicast group on device dev
@@ -1296,6 +1298,7 @@ void ip_mc_dec_group(struct in_device *in_dev, __be32 addr) 
		}

	}

}

EXPORT_SYMBOL(ip_mc_dec_group);



/* Device changing type */
@@ -1804,6 +1807,7 @@ int ip_mc_join_group(struct sock *sk , struct ip_mreqn *imr) 
	rtnl_unlock();

	return err;

}

EXPORT_SYMBOL(ip_mc_join_group);



static void ip_sf_socklist_reclaim(struct rcu_head *rp)

{
@@ -2676,8 +2680,3 @@ int __init igmp_mc_proc_init(void) 
	return register_pernet_subsys(&igmp_net_ops);

}

#endif
 


EXPORT_SYMBOL(ip_mc_dec_group);

EXPORT_SYMBOL(ip_mc_inc_group);

EXPORT_SYMBOL(ip_mc_join_group);

EXPORT_SYMBOL(ip_mc_rejoin_group);