| Message ID | 1387540630-11052-7-git-send-email-chenweilong@huawei.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, 2013-12-20 at 19:57 +0800, Chen Weilong wrote: > From: Weilong Chen <chenweilong@huawei.com> > > > Signed-off-by: Weilong Chen <chenweilong@huawei.com> > --- > net/ipv4/cipso_ipv4.c | 6 +++--- > net/ipv4/sysctl_net_ipv4.c | 2 +- > net/ipv4/xfrm4_mode_beet.c | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c > index 4b59b6e..081f51a 100644 > --- a/net/ipv4/cipso_ipv4.c > +++ b/net/ipv4/cipso_ipv4.c > @@ -1336,7 +1336,7 @@ static int cipso_v4_parsetag_rbm(const struct cipso_v4_doi *doi_def, > > if (tag_len > 4) { > secattr->attr.mls.cat = > - netlbl_secattr_catmap_alloc(GFP_ATOMIC); > + netlbl_secattr_catmap_alloc(GFP_ATOMIC); > if (secattr->attr.mls.cat == NULL) > return -ENOMEM; > > @@ -1432,7 +1432,7 @@ static int cipso_v4_parsetag_enum(const struct cipso_v4_doi *doi_def, > > if (tag_len > 4) { > secattr->attr.mls.cat = > - netlbl_secattr_catmap_alloc(GFP_ATOMIC); > + netlbl_secattr_catmap_alloc(GFP_ATOMIC); > if (secattr->attr.mls.cat == NULL) > return -ENOMEM; > > @@ -1527,7 +1527,7 @@ static int cipso_v4_parsetag_rng(const struct cipso_v4_doi *doi_def, > > if (tag_len > 4) { > secattr->attr.mls.cat = > - netlbl_secattr_catmap_alloc(GFP_ATOMIC); > + netlbl_secattr_catmap_alloc(GFP_ATOMIC); > if (secattr->attr.mls.cat == NULL) > return -ENOMEM; > [...] These lines are still excessively indented (one extra tab is enough), and could just be appended to the lines above them: secattr->attr.mls.cat = netlbl_secattr_catmap_alloc(GFP_ATOMIC); (exactly 80 columns long). Ben.
On 2013/12/21 1:53, Ben Hutchings wrote: > On Fri, 2013-12-20 at 19:57 +0800, Chen Weilong wrote: >> From: Weilong Chen <chenweilong@huawei.com> >> >> >> Signed-off-by: Weilong Chen <chenweilong@huawei.com> >> --- >> net/ipv4/cipso_ipv4.c | 6 +++--- >> net/ipv4/sysctl_net_ipv4.c | 2 +- >> net/ipv4/xfrm4_mode_beet.c | 2 +- >> 3 files changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c >> index 4b59b6e..081f51a 100644 >> --- a/net/ipv4/cipso_ipv4.c >> +++ b/net/ipv4/cipso_ipv4.c >> @@ -1336,7 +1336,7 @@ static int cipso_v4_parsetag_rbm(const struct cipso_v4_doi *doi_def, >> >> if (tag_len > 4) { >> secattr->attr.mls.cat = >> - netlbl_secattr_catmap_alloc(GFP_ATOMIC); >> + netlbl_secattr_catmap_alloc(GFP_ATOMIC); >> if (secattr->attr.mls.cat == NULL) >> return -ENOMEM; >> >> @@ -1432,7 +1432,7 @@ static int cipso_v4_parsetag_enum(const struct cipso_v4_doi *doi_def, >> >> if (tag_len > 4) { >> secattr->attr.mls.cat = >> - netlbl_secattr_catmap_alloc(GFP_ATOMIC); >> + netlbl_secattr_catmap_alloc(GFP_ATOMIC); >> if (secattr->attr.mls.cat == NULL) >> return -ENOMEM; >> >> @@ -1527,7 +1527,7 @@ static int cipso_v4_parsetag_rng(const struct cipso_v4_doi *doi_def, >> >> if (tag_len > 4) { >> secattr->attr.mls.cat = >> - netlbl_secattr_catmap_alloc(GFP_ATOMIC); >> + netlbl_secattr_catmap_alloc(GFP_ATOMIC); >> if (secattr->attr.mls.cat == NULL) >> return -ENOMEM; >> > [...] > > These lines are still excessively indented (one extra tab is enough), > and could just be appended to the lines above them: > > secattr->attr.mls.cat = netlbl_secattr_catmap_alloc(GFP_ATOMIC); > > (exactly 80 columns long). > > Ben. > OK, That's very good, Thanks! -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c index 4b59b6e..081f51a 100644 --- a/net/ipv4/cipso_ipv4.c +++ b/net/ipv4/cipso_ipv4.c @@ -1336,7 +1336,7 @@ static int cipso_v4_parsetag_rbm(const struct cipso_v4_doi *doi_def, if (tag_len > 4) { secattr->attr.mls.cat = - netlbl_secattr_catmap_alloc(GFP_ATOMIC); + netlbl_secattr_catmap_alloc(GFP_ATOMIC); if (secattr->attr.mls.cat == NULL) return -ENOMEM; @@ -1432,7 +1432,7 @@ static int cipso_v4_parsetag_enum(const struct cipso_v4_doi *doi_def, if (tag_len > 4) { secattr->attr.mls.cat = - netlbl_secattr_catmap_alloc(GFP_ATOMIC); + netlbl_secattr_catmap_alloc(GFP_ATOMIC); if (secattr->attr.mls.cat == NULL) return -ENOMEM; @@ -1527,7 +1527,7 @@ static int cipso_v4_parsetag_rng(const struct cipso_v4_doi *doi_def, if (tag_len > 4) { secattr->attr.mls.cat = - netlbl_secattr_catmap_alloc(GFP_ATOMIC); + netlbl_secattr_catmap_alloc(GFP_ATOMIC); if (secattr->attr.mls.cat == NULL) return -ENOMEM; diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index d7b63a6..1d2480a 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c @@ -700,7 +700,7 @@ static struct ctl_table ipv4_table[] = { .mode = 0644, .proc_handler = proc_dointvec }, - { + { .procname = "tcp_thin_dupack", .data = &sysctl_tcp_thin_dupack, .maxlen = sizeof(int), diff --git a/net/ipv4/xfrm4_mode_beet.c b/net/ipv4/xfrm4_mode_beet.c index e3db3f9..71acd00 100644 --- a/net/ipv4/xfrm4_mode_beet.c +++ b/net/ipv4/xfrm4_mode_beet.c @@ -48,7 +48,7 @@ static int xfrm4_beet_output(struct xfrm_state *x, struct sk_buff *skb) hdrlen += IPV4_BEET_PHMAXLEN - (optlen & 4); skb_set_network_header(skb, -x->props.header_len - - hdrlen + (XFRM_MODE_SKB_CB(skb)->ihl - sizeof(*top_iph))); + hdrlen + (XFRM_MODE_SKB_CB(skb)->ihl - sizeof(*top_iph))); if (x->sel.family != AF_INET6) skb->network_header += IPV4_BEET_PHMAXLEN; skb->mac_header = skb->network_header +