ipv6: White-space cleansing : Structure layouts

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 addresses structure definitions, specifically it cleanses the brace
placement and replaces spaces with tabs in a few places.

Signed-off-by: Ian Morris <ipm@chirality.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index ac71d9e0a500aed5fb2779e9f49b3e7f27c5a106..fcffd4e522c88276620cd52c56bbc574b159146f 100644 (file)
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -755,11 +755,10 @@ static int ah6_rcv_cb(struct sk_buff *skb, int err)
        return 0;
 }
 
-static const struct xfrm_type ah6_type =
-{
+static const struct xfrm_type ah6_type = {
        .description    = "AH6",
        .owner          = THIS_MODULE,
-       .proto          = IPPROTO_AH,
+       .proto          = IPPROTO_AH,
        .flags          = XFRM_TYPE_REPLAY_PROT,
        .init_state     = ah6_init_state,
        .destructor     = ah6_destroy,

diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 7b6e830ebc6de28bd7bf2a132ce627a965f94c2d..83fc3a385a26782c316914c4f8aafab78fe1a5e2 100644 (file)
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -621,11 +621,10 @@ static int esp6_rcv_cb(struct sk_buff *skb, int err)
        return 0;
 }
 
-static const struct xfrm_type esp6_type =
-{
+static const struct xfrm_type esp6_type = {
        .description    = "ESP6",
-       .owner          = THIS_MODULE,
-       .proto          = IPPROTO_ESP,
+       .owner          = THIS_MODULE,
+       .proto          = IPPROTO_ESP,
        .flags          = XFRM_TYPE_REPLAY_PROT,
        .init_state     = esp6_init_state,
        .destructor     = esp6_destroy,

diff --git a/net/ipv6/ipcomp6.c b/net/ipv6/ipcomp6.c
index d1c793cffcb5f44aba0f922f2ebdd3105d51b49f..1b9316e1386a96c899c67888fba4618d3004e69a 100644 (file)
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@@ -181,8 +181,7 @@ static int ipcomp6_rcv_cb(struct sk_buff *skb, int err)
        return 0;
 }
 
-static const struct xfrm_type ipcomp6_type =
-{
+static const struct xfrm_type ipcomp6_type = {
        .description    = "IPCOMP6",
        .owner          = THIS_MODULE,
        .proto          = IPPROTO_COMP,
@@ -193,8 +192,7 @@ static const struct xfrm_type ipcomp6_type =
        .hdr_offset     = xfrm6_find_1stfragopt,
 };
 
-static struct xfrm6_protocol ipcomp6_protocol =
-{
+static struct xfrm6_protocol ipcomp6_protocol = {
        .handler        = xfrm6_rcv,
        .cb_handler     = ipcomp6_rcv_cb,
        .err_handler    = ipcomp6_err,

diff --git a/net/ipv6/mip6.c b/net/ipv6/mip6.c
index db9b6cbc9db3905695888343912be7dfd06af6f2..f61429d391d32693f3fb92fd75c630c01520f776 100644 (file)
--- a/net/ipv6/mip6.c
+++ b/net/ipv6/mip6.c
@@ -336,11 +336,10 @@ static void mip6_destopt_destroy(struct xfrm_state *x)
 {
 }
 
-static const struct xfrm_type mip6_destopt_type =
-{
+static const struct xfrm_type mip6_destopt_type = {
        .description    = "MIP6DESTOPT",
        .owner          = THIS_MODULE,
-       .proto          = IPPROTO_DSTOPTS,
+       .proto          = IPPROTO_DSTOPTS,
        .flags          = XFRM_TYPE_NON_FRAGMENT | XFRM_TYPE_LOCAL_COADDR,
        .init_state     = mip6_destopt_init_state,
        .destructor     = mip6_destopt_destroy,
@@ -469,11 +468,10 @@ static void mip6_rthdr_destroy(struct xfrm_state *x)
 {
 }
 
-static const struct xfrm_type mip6_rthdr_type =
-{
+static const struct xfrm_type mip6_rthdr_type = {
        .description    = "MIP6RT",
        .owner          = THIS_MODULE,
-       .proto          = IPPROTO_ROUTING,
+       .proto          = IPPROTO_ROUTING,
        .flags          = XFRM_TYPE_NON_FRAGMENT | XFRM_TYPE_REMOTE_COADDR,
        .init_state     = mip6_rthdr_init_state,
        .destructor     = mip6_rthdr_destroy,

diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index fe156d99179efff7f27cfa88e7053225e3e4ae5a..1a157ca2ebc18c5a12519adb9eacd30d508722eb 100644 (file)
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -62,8 +62,7 @@
 
 static const char ip6_frag_cache_name[] = "ip6-frags";
 
-struct ip6frag_skb_cb
-{
+struct ip6frag_skb_cb {
        struct inet6_skb_parm   h;
        int                     offset;
 };
@@ -575,8 +574,7 @@ static int ipv6_frag_rcv(struct sk_buff *skb)
        return -1;
 }
 
-static const struct inet6_protocol frag_protocol =
-{
+static const struct inet6_protocol frag_protocol = {
        .handler        =       ipv6_frag_rcv,
        .flags          =       INET6_PROTO_NOPOLICY,
 };