aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/exthdrs.c
diff options
context:
space:
mode:
authorEldad Zack <eldad@fogrefinery.com>2012-04-01 03:49:04 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-02 04:33:45 -0400
commitac3c8172ff5efa8078e5380677dff0badf70b729 (patch)
tree7b1b9203cc5e841d1c0d760d3b08bdaa34007314 /net/ipv6/exthdrs.c
parentb5a4257cef5e8d6efb2ac9322b00377279ffd234 (diff)
net/ipv6/exthdrs.c: Checkpatch cleanups
exthdrs.c:726: WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable exthdrs.c:741: ERROR: "(foo*)" should be "(foo *)" exthdrs.c:741: ERROR: "(foo*)" should be "(foo *)" exthdrs.c:744: ERROR: "(foo**)" should be "(foo **)" exthdrs.c:746: ERROR: "(foo**)" should be "(foo **)" exthdrs.c:748: ERROR: "(foo**)" should be "(foo **)" exthdrs.c:750: ERROR: "(foo**)" should be "(foo **)" exthdrs.c:755: WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable exthdrs.c:896: WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable Signed-off-by: Eldad Zack <eldad@fogrefinery.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/exthdrs.c')
-rw-r--r--net/ipv6/exthdrs.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index 3d641b6e9b09..c486b8e1817f 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -722,7 +722,6 @@ void ipv6_push_nfrag_opts(struct sk_buff *skb, struct ipv6_txoptions *opt,
722 if (opt->hopopt) 722 if (opt->hopopt)
723 ipv6_push_exthdr(skb, proto, NEXTHDR_HOP, opt->hopopt); 723 ipv6_push_exthdr(skb, proto, NEXTHDR_HOP, opt->hopopt);
724} 724}
725
726EXPORT_SYMBOL(ipv6_push_nfrag_opts); 725EXPORT_SYMBOL(ipv6_push_nfrag_opts);
727 726
728void ipv6_push_frag_opts(struct sk_buff *skb, struct ipv6_txoptions *opt, u8 *proto) 727void ipv6_push_frag_opts(struct sk_buff *skb, struct ipv6_txoptions *opt, u8 *proto)
@@ -738,20 +737,19 @@ ipv6_dup_options(struct sock *sk, struct ipv6_txoptions *opt)
738 737
739 opt2 = sock_kmalloc(sk, opt->tot_len, GFP_ATOMIC); 738 opt2 = sock_kmalloc(sk, opt->tot_len, GFP_ATOMIC);
740 if (opt2) { 739 if (opt2) {
741 long dif = (char*)opt2 - (char*)opt; 740 long dif = (char *)opt2 - (char *)opt;
742 memcpy(opt2, opt, opt->tot_len); 741 memcpy(opt2, opt, opt->tot_len);
743 if (opt2->hopopt) 742 if (opt2->hopopt)
744 *((char**)&opt2->hopopt) += dif; 743 *((char **)&opt2->hopopt) += dif;
745 if (opt2->dst0opt) 744 if (opt2->dst0opt)
746 *((char**)&opt2->dst0opt) += dif; 745 *((char **)&opt2->dst0opt) += dif;
747 if (opt2->dst1opt) 746 if (opt2->dst1opt)
748 *((char**)&opt2->dst1opt) += dif; 747 *((char **)&opt2->dst1opt) += dif;
749 if (opt2->srcrt) 748 if (opt2->srcrt)
750 *((char**)&opt2->srcrt) += dif; 749 *((char **)&opt2->srcrt) += dif;
751 } 750 }
752 return opt2; 751 return opt2;
753} 752}
754
755EXPORT_SYMBOL_GPL(ipv6_dup_options); 753EXPORT_SYMBOL_GPL(ipv6_dup_options);
756 754
757static int ipv6_renew_option(void *ohdr, 755static int ipv6_renew_option(void *ohdr,
@@ -892,5 +890,4 @@ struct in6_addr *fl6_update_dst(struct flowi6 *fl6,
892 fl6->daddr = *((struct rt0_hdr *)opt->srcrt)->addr; 890 fl6->daddr = *((struct rt0_hdr *)opt->srcrt)->addr;
893 return orig; 891 return orig;
894} 892}
895
896EXPORT_SYMBOL_GPL(fl6_update_dst); 893EXPORT_SYMBOL_GPL(fl6_update_dst);