diff options
author | Daniel Baluta <dbaluta@ixiacom.com> | 2012-04-14 21:34:41 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-15 12:37:19 -0400 |
commit | 5e73ea1a31c3612aa6dfe44f864ca5b7b6a4cff9 (patch) | |
tree | ab5eebe93e10e7e69042b15603a5b3844c049f6b /net/ipv4/ip_options.c | |
parent | 586d17c5a01bf1ae4e215adc6c48457eee5482bc (diff) |
ipv4: fix checkpatch errors
Fix checkpatch errors of the following type:
* ERROR: "foo * bar" should be "foo *bar"
* ERROR: "(foo*)" should be "(foo *)"
Signed-off-by: Daniel Baluta <dbaluta@ixiacom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_options.c')
-rw-r--r-- | net/ipv4/ip_options.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index a0d0d9d9b870..1372c4586edc 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c | |||
@@ -210,10 +210,10 @@ int ip_options_echo(struct ip_options *dopt, struct sk_buff *skb) | |||
210 | * Simple and stupid 8), but the most efficient way. | 210 | * Simple and stupid 8), but the most efficient way. |
211 | */ | 211 | */ |
212 | 212 | ||
213 | void ip_options_fragment(struct sk_buff * skb) | 213 | void ip_options_fragment(struct sk_buff *skb) |
214 | { | 214 | { |
215 | unsigned char *optptr = skb_network_header(skb) + sizeof(struct iphdr); | 215 | unsigned char *optptr = skb_network_header(skb) + sizeof(struct iphdr); |
216 | struct ip_options * opt = &(IPCB(skb)->opt); | 216 | struct ip_options *opt = &(IPCB(skb)->opt); |
217 | int l = opt->optlen; | 217 | int l = opt->optlen; |
218 | int optlen; | 218 | int optlen; |
219 | 219 | ||
@@ -248,13 +248,13 @@ void ip_options_fragment(struct sk_buff * skb) | |||
248 | */ | 248 | */ |
249 | 249 | ||
250 | int ip_options_compile(struct net *net, | 250 | int ip_options_compile(struct net *net, |
251 | struct ip_options * opt, struct sk_buff * skb) | 251 | struct ip_options *opt, struct sk_buff *skb) |
252 | { | 252 | { |
253 | int l; | 253 | int l; |
254 | unsigned char * iph; | 254 | unsigned char *iph; |
255 | unsigned char * optptr; | 255 | unsigned char *optptr; |
256 | int optlen; | 256 | int optlen; |
257 | unsigned char * pp_ptr = NULL; | 257 | unsigned char *pp_ptr = NULL; |
258 | struct rtable *rt = NULL; | 258 | struct rtable *rt = NULL; |
259 | 259 | ||
260 | if (skb != NULL) { | 260 | if (skb != NULL) { |
@@ -473,20 +473,20 @@ EXPORT_SYMBOL(ip_options_compile); | |||
473 | * Undo all the changes done by ip_options_compile(). | 473 | * Undo all the changes done by ip_options_compile(). |
474 | */ | 474 | */ |
475 | 475 | ||
476 | void ip_options_undo(struct ip_options * opt) | 476 | void ip_options_undo(struct ip_options *opt) |
477 | { | 477 | { |
478 | if (opt->srr) { | 478 | if (opt->srr) { |
479 | unsigned char * optptr = opt->__data+opt->srr-sizeof(struct iphdr); | 479 | unsigned char *optptr = opt->__data+opt->srr-sizeof(struct iphdr); |
480 | memmove(optptr+7, optptr+3, optptr[1]-7); | 480 | memmove(optptr+7, optptr+3, optptr[1]-7); |
481 | memcpy(optptr+3, &opt->faddr, 4); | 481 | memcpy(optptr+3, &opt->faddr, 4); |
482 | } | 482 | } |
483 | if (opt->rr_needaddr) { | 483 | if (opt->rr_needaddr) { |
484 | unsigned char * optptr = opt->__data+opt->rr-sizeof(struct iphdr); | 484 | unsigned char *optptr = opt->__data+opt->rr-sizeof(struct iphdr); |
485 | optptr[2] -= 4; | 485 | optptr[2] -= 4; |
486 | memset(&optptr[optptr[2]-1], 0, 4); | 486 | memset(&optptr[optptr[2]-1], 0, 4); |
487 | } | 487 | } |
488 | if (opt->ts) { | 488 | if (opt->ts) { |
489 | unsigned char * optptr = opt->__data+opt->ts-sizeof(struct iphdr); | 489 | unsigned char *optptr = opt->__data+opt->ts-sizeof(struct iphdr); |
490 | if (opt->ts_needtime) { | 490 | if (opt->ts_needtime) { |
491 | optptr[2] -= 4; | 491 | optptr[2] -= 4; |
492 | memset(&optptr[optptr[2]-1], 0, 4); | 492 | memset(&optptr[optptr[2]-1], 0, 4); |
@@ -549,8 +549,8 @@ int ip_options_get(struct net *net, struct ip_options_rcu **optp, | |||
549 | 549 | ||
550 | void ip_forward_options(struct sk_buff *skb) | 550 | void ip_forward_options(struct sk_buff *skb) |
551 | { | 551 | { |
552 | struct ip_options * opt = &(IPCB(skb)->opt); | 552 | struct ip_options *opt = &(IPCB(skb)->opt); |
553 | unsigned char * optptr; | 553 | unsigned char *optptr; |
554 | struct rtable *rt = skb_rtable(skb); | 554 | struct rtable *rt = skb_rtable(skb); |
555 | unsigned char *raw = skb_network_header(skb); | 555 | unsigned char *raw = skb_network_header(skb); |
556 | 556 | ||