Commit cc24beca authored by Ian Morris's avatar Ian Morris Committed by David S. Miller

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: default avatarIan Morris <ipm@chirality.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 67ba4152
...@@ -755,11 +755,10 @@ static int ah6_rcv_cb(struct sk_buff *skb, int err) ...@@ -755,11 +755,10 @@ static int ah6_rcv_cb(struct sk_buff *skb, int err)
return 0; return 0;
} }
static const struct xfrm_type ah6_type = static const struct xfrm_type ah6_type = {
{
.description = "AH6", .description = "AH6",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_AH, .proto = IPPROTO_AH,
.flags = XFRM_TYPE_REPLAY_PROT, .flags = XFRM_TYPE_REPLAY_PROT,
.init_state = ah6_init_state, .init_state = ah6_init_state,
.destructor = ah6_destroy, .destructor = ah6_destroy,
......
...@@ -621,11 +621,10 @@ static int esp6_rcv_cb(struct sk_buff *skb, int err) ...@@ -621,11 +621,10 @@ static int esp6_rcv_cb(struct sk_buff *skb, int err)
return 0; return 0;
} }
static const struct xfrm_type esp6_type = static const struct xfrm_type esp6_type = {
{
.description = "ESP6", .description = "ESP6",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_ESP, .proto = IPPROTO_ESP,
.flags = XFRM_TYPE_REPLAY_PROT, .flags = XFRM_TYPE_REPLAY_PROT,
.init_state = esp6_init_state, .init_state = esp6_init_state,
.destructor = esp6_destroy, .destructor = esp6_destroy,
......
...@@ -181,8 +181,7 @@ static int ipcomp6_rcv_cb(struct sk_buff *skb, int err) ...@@ -181,8 +181,7 @@ static int ipcomp6_rcv_cb(struct sk_buff *skb, int err)
return 0; return 0;
} }
static const struct xfrm_type ipcomp6_type = static const struct xfrm_type ipcomp6_type = {
{
.description = "IPCOMP6", .description = "IPCOMP6",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_COMP, .proto = IPPROTO_COMP,
...@@ -193,8 +192,7 @@ static const struct xfrm_type ipcomp6_type = ...@@ -193,8 +192,7 @@ static const struct xfrm_type ipcomp6_type =
.hdr_offset = xfrm6_find_1stfragopt, .hdr_offset = xfrm6_find_1stfragopt,
}; };
static struct xfrm6_protocol ipcomp6_protocol = static struct xfrm6_protocol ipcomp6_protocol = {
{
.handler = xfrm6_rcv, .handler = xfrm6_rcv,
.cb_handler = ipcomp6_rcv_cb, .cb_handler = ipcomp6_rcv_cb,
.err_handler = ipcomp6_err, .err_handler = ipcomp6_err,
......
...@@ -336,11 +336,10 @@ static void mip6_destopt_destroy(struct xfrm_state *x) ...@@ -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", .description = "MIP6DESTOPT",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_DSTOPTS, .proto = IPPROTO_DSTOPTS,
.flags = XFRM_TYPE_NON_FRAGMENT | XFRM_TYPE_LOCAL_COADDR, .flags = XFRM_TYPE_NON_FRAGMENT | XFRM_TYPE_LOCAL_COADDR,
.init_state = mip6_destopt_init_state, .init_state = mip6_destopt_init_state,
.destructor = mip6_destopt_destroy, .destructor = mip6_destopt_destroy,
...@@ -469,11 +468,10 @@ static void mip6_rthdr_destroy(struct xfrm_state *x) ...@@ -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", .description = "MIP6RT",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.proto = IPPROTO_ROUTING, .proto = IPPROTO_ROUTING,
.flags = XFRM_TYPE_NON_FRAGMENT | XFRM_TYPE_REMOTE_COADDR, .flags = XFRM_TYPE_NON_FRAGMENT | XFRM_TYPE_REMOTE_COADDR,
.init_state = mip6_rthdr_init_state, .init_state = mip6_rthdr_init_state,
.destructor = mip6_rthdr_destroy, .destructor = mip6_rthdr_destroy,
......
...@@ -62,8 +62,7 @@ ...@@ -62,8 +62,7 @@
static const char ip6_frag_cache_name[] = "ip6-frags"; static const char ip6_frag_cache_name[] = "ip6-frags";
struct ip6frag_skb_cb struct ip6frag_skb_cb {
{
struct inet6_skb_parm h; struct inet6_skb_parm h;
int offset; int offset;
}; };
...@@ -575,8 +574,7 @@ static int ipv6_frag_rcv(struct sk_buff *skb) ...@@ -575,8 +574,7 @@ static int ipv6_frag_rcv(struct sk_buff *skb)
return -1; return -1;
} }
static const struct inet6_protocol frag_protocol = static const struct inet6_protocol frag_protocol = {
{
.handler = ipv6_frag_rcv, .handler = ipv6_frag_rcv,
.flags = INET6_PROTO_NOPOLICY, .flags = INET6_PROTO_NOPOLICY,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment