aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSheng Yong <shengyong1@huawei.com>2015-04-07 21:26:18 -0400
committerDavid S. Miller <davem@davemloft.net>2015-04-07 22:24:37 -0400
commit8bc0034cf6951a107e0c75c2d10b17b57d681229 (patch)
tree77438f3a4e0deb2d11c1402315776fb96fabaaae
parentee90b81203a91d4e5385622811ee7872b5bcfe76 (diff)
net: remove extra newlines
Signed-off-by: Sheng Yong <shengyong1@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/ipv6.h2
-rw-r--r--net/core/skbuff.c1
-rw-r--r--net/ipv4/ip_output.c3
-rw-r--r--net/ipv4/udp.c5
-rw-r--r--net/ipv6/udp.c3
5 files changed, 0 insertions, 14 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 27470cd1d5f8..eec8ad3c9843 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -47,8 +47,6 @@
47 47
48#define NEXTHDR_MAX 255 48#define NEXTHDR_MAX 255
49 49
50
51
52#define IPV6_DEFAULT_HOPLIMIT 64 50#define IPV6_DEFAULT_HOPLIMIT 64
53#define IPV6_DEFAULT_MCASTHOPS 1 51#define IPV6_DEFAULT_MCASTHOPS 1
54 52
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index cdb939b731aa..3b6e5830256e 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -3752,7 +3752,6 @@ void skb_complete_wifi_ack(struct sk_buff *skb, bool acked)
3752} 3752}
3753EXPORT_SYMBOL_GPL(skb_complete_wifi_ack); 3753EXPORT_SYMBOL_GPL(skb_complete_wifi_ack);
3754 3754
3755
3756/** 3755/**
3757 * skb_partial_csum_set - set up and verify partial csum values for packet 3756 * skb_partial_csum_set - set up and verify partial csum values for packet
3758 * @skb: the skb to set 3757 * @skb: the skb to set
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 5da4d15262fd..c65b93a7b711 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -455,7 +455,6 @@ no_route:
455} 455}
456EXPORT_SYMBOL(ip_queue_xmit); 456EXPORT_SYMBOL(ip_queue_xmit);
457 457
458
459static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from) 458static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from)
460{ 459{
461 to->pkt_type = from->pkt_type; 460 to->pkt_type = from->pkt_type;
@@ -820,7 +819,6 @@ static inline int ip_ufo_append_data(struct sock *sk,
820 819
821 skb->csum = 0; 820 skb->csum = 0;
822 821
823
824 __skb_queue_tail(queue, skb); 822 __skb_queue_tail(queue, skb);
825 } else if (skb_is_gso(skb)) { 823 } else if (skb_is_gso(skb)) {
826 goto append; 824 goto append;
@@ -1218,7 +1216,6 @@ ssize_t ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page,
1218 skb_shinfo(skb)->gso_type = SKB_GSO_UDP; 1216 skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
1219 } 1217 }
1220 1218
1221
1222 while (size > 0) { 1219 while (size > 0) {
1223 int i; 1220 int i;
1224 1221
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 2162fc6ce1c1..d10b7e0112eb 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -433,7 +433,6 @@ static u32 udp_ehashfn(const struct net *net, const __be32 laddr,
433 udp_ehash_secret + net_hash_mix(net)); 433 udp_ehash_secret + net_hash_mix(net));
434} 434}
435 435
436
437/* called with read_rcu_lock() */ 436/* called with read_rcu_lock() */
438static struct sock *udp4_lib_lookup2(struct net *net, 437static struct sock *udp4_lib_lookup2(struct net *net,
439 __be32 saddr, __be16 sport, 438 __be32 saddr, __be16 sport,
@@ -1171,7 +1170,6 @@ out:
1171 return ret; 1170 return ret;
1172} 1171}
1173 1172
1174
1175/** 1173/**
1176 * first_packet_length - return length of first packet in receive queue 1174 * first_packet_length - return length of first packet in receive queue
1177 * @sk: socket 1175 * @sk: socket
@@ -1355,7 +1353,6 @@ csum_copy_err:
1355 goto try_again; 1353 goto try_again;
1356} 1354}
1357 1355
1358
1359int udp_disconnect(struct sock *sk, int flags) 1356int udp_disconnect(struct sock *sk, int flags)
1360{ 1357{
1361 struct inet_sock *inet = inet_sk(sk); 1358 struct inet_sock *inet = inet_sk(sk);
@@ -1579,7 +1576,6 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
1579 udp_lib_checksum_complete(skb)) 1576 udp_lib_checksum_complete(skb))
1580 goto csum_error; 1577 goto csum_error;
1581 1578
1582
1583 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) { 1579 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
1584 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS, 1580 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
1585 is_udplite); 1581 is_udplite);
@@ -1609,7 +1605,6 @@ drop:
1609 return -1; 1605 return -1;
1610} 1606}
1611 1607
1612
1613static void flush_stack(struct sock **stack, unsigned int count, 1608static void flush_stack(struct sock **stack, unsigned int count,
1614 struct sk_buff *skb, unsigned int final) 1609 struct sk_buff *skb, unsigned int final)
1615{ 1610{
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 120aff9aa010..3477c919fcc8 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -120,7 +120,6 @@ static u32 udp6_portaddr_hash(const struct net *net,
120 return hash ^ port; 120 return hash ^ port;
121} 121}
122 122
123
124int udp_v6_get_port(struct sock *sk, unsigned short snum) 123int udp_v6_get_port(struct sock *sk, unsigned short snum)
125{ 124{
126 unsigned int hash2_nulladdr = 125 unsigned int hash2_nulladdr =
@@ -385,7 +384,6 @@ struct sock *udp6_lib_lookup(struct net *net, const struct in6_addr *saddr, __be
385} 384}
386EXPORT_SYMBOL_GPL(udp6_lib_lookup); 385EXPORT_SYMBOL_GPL(udp6_lib_lookup);
387 386
388
389/* 387/*
390 * This should be easy, if there is something there we 388 * This should be easy, if there is something there we
391 * return it, otherwise we block. 389 * return it, otherwise we block.
@@ -1555,7 +1553,6 @@ static struct inet_protosw udpv6_protosw = {
1555 .flags = INET_PROTOSW_PERMANENT, 1553 .flags = INET_PROTOSW_PERMANENT,
1556}; 1554};
1557 1555
1558
1559int __init udpv6_init(void) 1556int __init udpv6_init(void)
1560{ 1557{
1561 int ret; 1558 int ret;