Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

[net-next-2.6.git] / net / netfilter / ipvs / ip_vs_proto_sctp.c

diff --git a/net/netfilter/ipvs/ip_vs_proto_sctp.c b/net/netfilter/ipvs/ip_vs_proto_sctp.c
index d254345bfda7066504c305832340dc4105f827fb..1ea96bcd342b8fc81eb437a6826fc6652c2be4c2 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_proto_sctp.c
+++ b/net/netfilter/ipvs/ip_vs_proto_sctp.c
@@ -63,6 +63,7 @@ sctp_snat_handler(struct sk_buff *skb,
 {
        sctp_sctphdr_t *sctph;
        unsigned int sctphoff;
+       struct sk_buff *iter;
        __be32 crc32;
 
 #ifdef CONFIG_IP_VS_IPV6
@@ -91,8 +92,8 @@ sctp_snat_handler(struct sk_buff *skb,
 
        /* Calculate the checksum */
        crc32 = sctp_start_cksum((u8 *) sctph, skb_headlen(skb) - sctphoff);
-       for (skb = skb_shinfo(skb)->frag_list; skb; skb = skb->next)
-               crc32 = sctp_update_cksum((u8 *) skb->data, skb_headlen(skb),
+       skb_walk_frags(skb, iter)
+               crc32 = sctp_update_cksum((u8 *) iter->data, skb_headlen(iter),
                                          crc32);
        crc32 = sctp_end_cksum(crc32);
        sctph->checksum = crc32;
@@ -104,9 +105,9 @@ static int
 sctp_dnat_handler(struct sk_buff *skb,
                  struct ip_vs_protocol *pp, struct ip_vs_conn *cp)
 {
-
        sctp_sctphdr_t *sctph;
        unsigned int sctphoff;
+       struct sk_buff *iter;
        __be32 crc32;
 
 #ifdef CONFIG_IP_VS_IPV6
@@ -135,8 +136,8 @@ sctp_dnat_handler(struct sk_buff *skb,
 
        /* Calculate the checksum */
        crc32 = sctp_start_cksum((u8 *) sctph, skb_headlen(skb) - sctphoff);
-       for (skb = skb_shinfo(skb)->frag_list; skb; skb = skb->next)
-               crc32 = sctp_update_cksum((u8 *) skb->data, skb_headlen(skb),
+       skb_walk_frags(skb, iter)
+               crc32 = sctp_update_cksum((u8 *) iter->data, skb_headlen(iter),
                                          crc32);
        crc32 = sctp_end_cksum(crc32);
        sctph->checksum = crc32;
@@ -147,9 +148,9 @@ sctp_dnat_handler(struct sk_buff *skb,
 static int
 sctp_csum_check(int af, struct sk_buff *skb, struct ip_vs_protocol *pp)
 {
-       struct sk_buff *list = skb_shinfo(skb)->frag_list;
        unsigned int sctphoff;
        struct sctphdr *sh, _sctph;
+       struct sk_buff *iter;
        __le32 cmp;
        __le32 val;
        __u32 tmp;
@@ -168,9 +169,9 @@ sctp_csum_check(int af, struct sk_buff *skb, struct ip_vs_protocol *pp)
        cmp = sh->checksum;
 
        tmp = sctp_start_cksum((__u8 *) sh, skb_headlen(skb));
-       for (; list; list = list->next)
-               tmp = sctp_update_cksum((__u8 *) list->data,
-                                       skb_headlen(list), tmp);
+       skb_walk_frags(skb, iter)
+               tmp = sctp_update_cksum((__u8 *) iter->data,
+                                       skb_headlen(iter), tmp);
 
        val = sctp_end_cksum(tmp);