Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

[firefly-linux-kernel-4.4.55.git] / net / ipv6 / ip6_input.c

diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index 51d54dc376f3b1862040f38e6f58e2c75001049c..a3084ab5df6cd1b343af6d725975082f5c4b6eb6 100644 (file)
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -15,8 +15,8 @@
  */
 /* Changes
  *
- *     Mitsuru KANDA @USAGI and
- *     YOSHIFUJI Hideaki @USAGI: Remove ipv6_parse_exthdrs().
+ *     Mitsuru KANDA @USAGI and
+ *     YOSHIFUJI Hideaki @USAGI: Remove ipv6_parse_exthdrs().
  */
 
 #include <linux/errno.h>
@@ -65,7 +65,7 @@ int ip6_rcv_finish(struct sk_buff *skb)
 int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev)
 {
        const struct ipv6hdr *hdr;
-       u32             pkt_len;
+       u32 pkt_len;
        struct inet6_dev *idev;
        struct net *net = dev_net(skb->dev);