aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Morris <ipm@chirality.org.uk>2014-08-24 16:53:12 -0400
committerDavid S. Miller <davem@davemloft.net>2014-08-25 01:37:52 -0400
commit4c83acbc565d53296f1731034c5041a0fbabcaeb (patch)
tree4fcfc541e448ab4edd130b08ac7de044d88469f2
parentcc24becae3e87d7aa8238f4fcb29bfb68f7ffb97 (diff)
ipv6: White-space cleansing : gaps between function and symbol export
This patch makes no changes to the logic of the code but simply addresses coding style issues as detected by checkpatch. Both objdump and diff -w show no differences. This patch removes some blank lines between the end of a function definition and the EXPORT_SYMBOL_GPL macro in order to prevent checkpatch warning that EXPORT_SYMBOL must immediately follow a function. Signed-off-by: Ian Morris <ipm@chirality.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/inet6_connection_sock.c4
-rw-r--r--net/ipv6/inet6_hashtables.c3
-rw-r--r--net/ipv6/ip6_flowlabel.c1
-rw-r--r--net/ipv6/ip6_output.c1
-rw-r--r--net/ipv6/ipv6_sockglue.c4
-rw-r--r--net/ipv6/ndisc.c1
-rw-r--r--net/ipv6/route.c2
-rw-r--r--net/ipv6/tunnel6.c2
-rw-r--r--net/ipv6/xfrm6_input.c2
-rw-r--r--net/ipv6/xfrm6_output.c1
-rw-r--r--net/ipv6/xfrm6_tunnel.c2
11 files changed, 0 insertions, 23 deletions
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
index 8c33a0b52b64..29b32206e494 100644
--- a/net/ipv6/inet6_connection_sock.c
+++ b/net/ipv6/inet6_connection_sock.c
@@ -63,7 +63,6 @@ int inet6_csk_bind_conflict(const struct sock *sk,
63 63
64 return sk2 != NULL; 64 return sk2 != NULL;
65} 65}
66
67EXPORT_SYMBOL_GPL(inet6_csk_bind_conflict); 66EXPORT_SYMBOL_GPL(inet6_csk_bind_conflict);
68 67
69struct dst_entry *inet6_csk_route_req(struct sock *sk, 68struct dst_entry *inet6_csk_route_req(struct sock *sk,
@@ -144,7 +143,6 @@ struct request_sock *inet6_csk_search_req(const struct sock *sk,
144 143
145 return NULL; 144 return NULL;
146} 145}
147
148EXPORT_SYMBOL_GPL(inet6_csk_search_req); 146EXPORT_SYMBOL_GPL(inet6_csk_search_req);
149 147
150void inet6_csk_reqsk_queue_hash_add(struct sock *sk, 148void inet6_csk_reqsk_queue_hash_add(struct sock *sk,
@@ -160,7 +158,6 @@ void inet6_csk_reqsk_queue_hash_add(struct sock *sk,
160 reqsk_queue_hash_req(&icsk->icsk_accept_queue, h, req, timeout); 158 reqsk_queue_hash_req(&icsk->icsk_accept_queue, h, req, timeout);
161 inet_csk_reqsk_queue_added(sk, timeout); 159 inet_csk_reqsk_queue_added(sk, timeout);
162} 160}
163
164EXPORT_SYMBOL_GPL(inet6_csk_reqsk_queue_hash_add); 161EXPORT_SYMBOL_GPL(inet6_csk_reqsk_queue_hash_add);
165 162
166void inet6_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr) 163void inet6_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr)
@@ -175,7 +172,6 @@ void inet6_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr)
175 sin6->sin6_scope_id = ipv6_iface_scope_id(&sin6->sin6_addr, 172 sin6->sin6_scope_id = ipv6_iface_scope_id(&sin6->sin6_addr,
176 sk->sk_bound_dev_if); 173 sk->sk_bound_dev_if);
177} 174}
178
179EXPORT_SYMBOL_GPL(inet6_csk_addr2sockaddr); 175EXPORT_SYMBOL_GPL(inet6_csk_addr2sockaddr);
180 176
181static inline 177static inline
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
index 5f7927c06f18..051dffb49c90 100644
--- a/net/ipv6/inet6_hashtables.c
+++ b/net/ipv6/inet6_hashtables.c
@@ -222,7 +222,6 @@ begin:
222 rcu_read_unlock(); 222 rcu_read_unlock();
223 return result; 223 return result;
224} 224}
225
226EXPORT_SYMBOL_GPL(inet6_lookup_listener); 225EXPORT_SYMBOL_GPL(inet6_lookup_listener);
227 226
228struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo, 227struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo,
@@ -238,7 +237,6 @@ struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo,
238 237
239 return sk; 238 return sk;
240} 239}
241
242EXPORT_SYMBOL_GPL(inet6_lookup); 240EXPORT_SYMBOL_GPL(inet6_lookup);
243 241
244static int __inet6_check_established(struct inet_timewait_death_row *death_row, 242static int __inet6_check_established(struct inet_timewait_death_row *death_row,
@@ -324,5 +322,4 @@ int inet6_hash_connect(struct inet_timewait_death_row *death_row,
324 return __inet_hash_connect(death_row, sk, inet6_sk_port_offset(sk), 322 return __inet_hash_connect(death_row, sk, inet6_sk_port_offset(sk),
325 __inet6_check_established, __inet6_hash); 323 __inet6_check_established, __inet6_hash);
326} 324}
327
328EXPORT_SYMBOL_GPL(inet6_hash_connect); 325EXPORT_SYMBOL_GPL(inet6_hash_connect);
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
index 2ace4749bef4..3dd7d4ebd7cd 100644
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
@@ -259,7 +259,6 @@ struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk, __be32 label)
259 rcu_read_unlock_bh(); 259 rcu_read_unlock_bh();
260 return NULL; 260 return NULL;
261} 261}
262
263EXPORT_SYMBOL_GPL(fl6_sock_lookup); 262EXPORT_SYMBOL_GPL(fl6_sock_lookup);
264 263
265void fl6_free_socklist(struct sock *sk) 264void fl6_free_socklist(struct sock *sk)
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 4ead5547b5c6..b7a3e7b3378e 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -233,7 +233,6 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6,
233 kfree_skb(skb); 233 kfree_skb(skb);
234 return -EMSGSIZE; 234 return -EMSGSIZE;
235} 235}
236
237EXPORT_SYMBOL(ip6_xmit); 236EXPORT_SYMBOL(ip6_xmit);
238 237
239static int ip6_call_ra_chain(struct sk_buff *skb, int sel) 238static int ip6_call_ra_chain(struct sk_buff *skb, int sel)
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 64177efe5cca..e1a9583bb419 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -873,7 +873,6 @@ int ipv6_setsockopt(struct sock *sk, int level, int optname,
873#endif 873#endif
874 return err; 874 return err;
875} 875}
876
877EXPORT_SYMBOL(ipv6_setsockopt); 876EXPORT_SYMBOL(ipv6_setsockopt);
878 877
879#ifdef CONFIG_COMPAT 878#ifdef CONFIG_COMPAT
@@ -909,7 +908,6 @@ int compat_ipv6_setsockopt(struct sock *sk, int level, int optname,
909#endif 908#endif
910 return err; 909 return err;
911} 910}
912
913EXPORT_SYMBOL(compat_ipv6_setsockopt); 911EXPORT_SYMBOL(compat_ipv6_setsockopt);
914#endif 912#endif
915 913
@@ -1321,7 +1319,6 @@ int ipv6_getsockopt(struct sock *sk, int level, int optname,
1321#endif 1319#endif
1322 return err; 1320 return err;
1323} 1321}
1324
1325EXPORT_SYMBOL(ipv6_getsockopt); 1322EXPORT_SYMBOL(ipv6_getsockopt);
1326 1323
1327#ifdef CONFIG_COMPAT 1324#ifdef CONFIG_COMPAT
@@ -1364,7 +1361,6 @@ int compat_ipv6_getsockopt(struct sock *sk, int level, int optname,
1364#endif 1361#endif
1365 return err; 1362 return err;
1366} 1363}
1367
1368EXPORT_SYMBOL(compat_ipv6_getsockopt); 1364EXPORT_SYMBOL(compat_ipv6_getsockopt);
1369#endif 1365#endif
1370 1366
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 995a82945994..4cb45c1079a2 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -284,7 +284,6 @@ int ndisc_mc_map(const struct in6_addr *addr, char *buf, struct net_device *dev,
284 } 284 }
285 return -EINVAL; 285 return -EINVAL;
286} 286}
287
288EXPORT_SYMBOL(ndisc_mc_map); 287EXPORT_SYMBOL(ndisc_mc_map);
289 288
290static u32 ndisc_hash(const void *pkey, 289static u32 ndisc_hash(const void *pkey,
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 76c793096893..f74b0417bd60 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -843,7 +843,6 @@ struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr,
843 843
844 return NULL; 844 return NULL;
845} 845}
846
847EXPORT_SYMBOL(rt6_lookup); 846EXPORT_SYMBOL(rt6_lookup);
848 847
849/* ip6_ins_rt is called with FREE table->tb6_lock. 848/* ip6_ins_rt is called with FREE table->tb6_lock.
@@ -1041,7 +1040,6 @@ struct dst_entry *ip6_route_output(struct net *net, const struct sock *sk,
1041 1040
1042 return fib6_rule_lookup(net, fl6, flags, ip6_pol_route_output); 1041 return fib6_rule_lookup(net, fl6, flags, ip6_pol_route_output);
1043} 1042}
1044
1045EXPORT_SYMBOL(ip6_route_output); 1043EXPORT_SYMBOL(ip6_route_output);
1046 1044
1047struct dst_entry *ip6_blackhole_route(struct net *net, struct dst_entry *dst_orig) 1045struct dst_entry *ip6_blackhole_route(struct net *net, struct dst_entry *dst_orig)
diff --git a/net/ipv6/tunnel6.c b/net/ipv6/tunnel6.c
index 7a53d397c739..3c758007b327 100644
--- a/net/ipv6/tunnel6.c
+++ b/net/ipv6/tunnel6.c
@@ -64,7 +64,6 @@ err:
64 64
65 return ret; 65 return ret;
66} 66}
67
68EXPORT_SYMBOL(xfrm6_tunnel_register); 67EXPORT_SYMBOL(xfrm6_tunnel_register);
69 68
70int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler, unsigned short family) 69int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler, unsigned short family)
@@ -92,7 +91,6 @@ int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler, unsigned short family)
92 91
93 return ret; 92 return ret;
94} 93}
95
96EXPORT_SYMBOL(xfrm6_tunnel_deregister); 94EXPORT_SYMBOL(xfrm6_tunnel_deregister);
97 95
98#define for_each_tunnel_rcu(head, handler) \ 96#define for_each_tunnel_rcu(head, handler) \
diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c
index cd4c98c7c805..f48fbe4d16f5 100644
--- a/net/ipv6/xfrm6_input.c
+++ b/net/ipv6/xfrm6_input.c
@@ -52,7 +52,6 @@ int xfrm6_rcv(struct sk_buff *skb)
52 return xfrm6_rcv_spi(skb, skb_network_header(skb)[IP6CB(skb)->nhoff], 52 return xfrm6_rcv_spi(skb, skb_network_header(skb)[IP6CB(skb)->nhoff],
53 0); 53 0);
54} 54}
55
56EXPORT_SYMBOL(xfrm6_rcv); 55EXPORT_SYMBOL(xfrm6_rcv);
57 56
58int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr, 57int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,
@@ -142,5 +141,4 @@ int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,
142drop: 141drop:
143 return -1; 142 return -1;
144} 143}
145
146EXPORT_SYMBOL(xfrm6_input_addr); 144EXPORT_SYMBOL(xfrm6_input_addr);
diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
index 433672d07d0b..ca3f29b98ae5 100644
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@ -25,7 +25,6 @@ int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb,
25{ 25{
26 return ip6_find_1stfragopt(skb, prevhdr); 26 return ip6_find_1stfragopt(skb, prevhdr);
27} 27}
28
29EXPORT_SYMBOL(xfrm6_find_1stfragopt); 28EXPORT_SYMBOL(xfrm6_find_1stfragopt);
30 29
31static int xfrm6_local_dontfrag(struct sk_buff *skb) 30static int xfrm6_local_dontfrag(struct sk_buff *skb)
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c
index 7b2508be24fd..5743044cd660 100644
--- a/net/ipv6/xfrm6_tunnel.c
+++ b/net/ipv6/xfrm6_tunnel.c
@@ -110,7 +110,6 @@ __be32 xfrm6_tunnel_spi_lookup(struct net *net, const xfrm_address_t *saddr)
110 rcu_read_unlock_bh(); 110 rcu_read_unlock_bh();
111 return htonl(spi); 111 return htonl(spi);
112} 112}
113
114EXPORT_SYMBOL(xfrm6_tunnel_spi_lookup); 113EXPORT_SYMBOL(xfrm6_tunnel_spi_lookup);
115 114
116static int __xfrm6_tunnel_spi_check(struct net *net, u32 spi) 115static int __xfrm6_tunnel_spi_check(struct net *net, u32 spi)
@@ -187,7 +186,6 @@ __be32 xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr)
187 186
188 return htonl(spi); 187 return htonl(spi);
189} 188}
190
191EXPORT_SYMBOL(xfrm6_tunnel_alloc_spi); 189EXPORT_SYMBOL(xfrm6_tunnel_alloc_spi);
192 190
193static void x6spi_destroy_rcu(struct rcu_head *head) 191static void x6spi_destroy_rcu(struct rcu_head *head)