Skip to content

Commit

Permalink
ipv6: White-space cleansing : Structure layouts
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ian Morris authored and David S. Miller committed Aug 25, 2014
1 parent 67ba415 commit cc24bec
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 21 deletions.
5 changes: 2 additions & 3 deletions net/ipv6/ah6.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 3 additions & 4 deletions net/ipv6/esp6.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 2 additions & 4 deletions net/ipv6/ipcomp6.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
10 changes: 4 additions & 6 deletions net/ipv6/mip6.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
6 changes: 2 additions & 4 deletions net/ipv6/reassembly.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down Expand Up @@ -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,
};
Expand Down

0 comments on commit cc24bec

Please sign in to comment.