Merge branch 'hch.init_path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / net / netfilter / utils.c

diff --git a/net/netfilter/utils.c b/net/netfilter/utils.c
index 51b454d..cedf47a 100644 (file)
--- a/net/netfilter/utils.c
+++ b/net/netfilter/utils.c
@@ -25,7 +25,7 @@ __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook,
                        skb->ip_summed = CHECKSUM_UNNECESSARY;
                        break;
                }
-               /* fall through */
+               fallthrough;
        case CHECKSUM_NONE:
                if (protocol != IPPROTO_TCP && protocol != IPPROTO_UDP)
                        skb->csum = 0;
@@ -51,7 +51,7 @@ static __sum16 nf_ip_checksum_partial(struct sk_buff *skb, unsigned int hook,
        case CHECKSUM_COMPLETE:
                if (len == skb->len - dataoff)
                        return nf_ip_checksum(skb, hook, dataoff, protocol);
-               /* fall through */
+               fallthrough;
        case CHECKSUM_NONE:
                skb->csum = csum_tcpudp_nofold(iph->saddr, iph->daddr, protocol,
                                               skb->len - dataoff, 0);
@@ -79,7 +79,7 @@ __sum16 nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,
                        skb->ip_summed = CHECKSUM_UNNECESSARY;
                        break;
                }
-               /* fall through */
+               fallthrough;
        case CHECKSUM_NONE:
                skb->csum = ~csum_unfold(
                                csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
@@ -106,7 +106,7 @@ static __sum16 nf_ip6_checksum_partial(struct sk_buff *skb, unsigned int hook,
        case CHECKSUM_COMPLETE:
                if (len == skb->len - dataoff)
                        return nf_ip6_checksum(skb, hook, dataoff, protocol);
-               /* fall through */
+               fallthrough;
        case CHECKSUM_NONE:
                hsum = skb_checksum(skb, 0, dataoff, 0);
                skb->csum = ~csum_unfold(csum_ipv6_magic(&ip6h->saddr,