From a8e29460455146e6cfd05a3751c97bdf81980bf7 Mon Sep 17 00:00:00 2001
From: Changli Gao <xiaosuo@gmail.com>
Date: Wed, 18 May 2011 21:16:01 +0000
Subject: [PATCH] --- yaml --- r: 247712 b: refs/heads/master c:
 75e308c894c4a5e47c005b8e821ae5f539ad2ef3 h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/net/ipv4/ping.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ae1734b027ec..9814458c6363 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb0cd2fb539c4e454ed32e32194acc03b75753f3
+refs/heads/master: 75e308c894c4a5e47c005b8e821ae5f539ad2ef3
diff --git a/trunk/net/ipv4/ping.c b/trunk/net/ipv4/ping.c
index 5f9e2d1ea4df..1f3bb11490c9 100644
--- a/trunk/net/ipv4/ping.c
+++ b/trunk/net/ipv4/ping.c
@@ -187,7 +187,8 @@ static struct sock *ping_v4_lookup(struct net *net, u32 saddr, u32 daddr,
 	return sk;
 }
 
-static void inet_get_ping_group_range_net(struct net *net, gid_t *low, gid_t *high)
+static void inet_get_ping_group_range_net(struct net *net, gid_t *low,
+					  gid_t *high)
 {
 	gid_t *data = net->ipv4.sysctl_ping_group_range;
 	unsigned seq;
@@ -437,7 +438,8 @@ static int ping_getfrag(void *from, char * to,
 	return 0;
 }
 
-static int ping_push_pending_frames(struct sock *sk, struct pingfakehdr *pfh, struct flowi4 *fl4)
+static int ping_push_pending_frames(struct sock *sk, struct pingfakehdr *pfh,
+				    struct flowi4 *fl4)
 {
 	struct sk_buff *skb = skb_peek(&sk->sk_write_queue);
 
@@ -754,7 +756,9 @@ static struct sock *ping_get_first(struct seq_file *seq, int start)
 	for (state->bucket = start; state->bucket < PING_HTABLE_SIZE;
 	     ++state->bucket) {
 		struct hlist_nulls_node *node;
-		struct hlist_nulls_head *hslot = &ping_table.hash[state->bucket];
+		struct hlist_nulls_head *hslot;
+
+		hslot = &ping_table.hash[state->bucket];
 
 		if (hlist_nulls_empty(hslot))
 			continue;