checkpatch: make --strict the default for drivers/staging files and patches

[firefly-linux-kernel-4.4.55.git] / net / 6lowpan / iphc.c

diff --git a/net/6lowpan/iphc.c b/net/6lowpan/iphc.c
index 9055d7b9d1129d69e34f8ed255922b2e340fcbb1..1e0071fdcf72a036d6697f2e453ba303b69abbe0 100644 (file)
--- a/net/6lowpan/iphc.c
+++ b/net/6lowpan/iphc.c
@@ -48,7 +48,6 @@
 
 #include <linux/bitops.h>
 #include <linux/if_arp.h>
-#include <linux/module.h>
 #include <linux/netdevice.h>
 #include <net/6lowpan.h>
 #include <net/ipv6.h>
@@ -284,7 +283,7 @@ lowpan_header_decompress(struct sk_buff *skb, struct net_device *dev,
                if (lowpan_fetch_skb(skb, &tmp, sizeof(tmp)))
                        return -EINVAL;
 
-               hdr.flow_lbl[0] = (skb->data[0] & 0x0F) | ((tmp >> 2) & 0x30);
+               hdr.flow_lbl[0] = (tmp & 0x0F) | ((tmp >> 2) & 0x30);
                memcpy(&hdr.flow_lbl[1], &skb->data[0], 2);
                skb_pull(skb, 2);
                break;
@@ -610,21 +609,3 @@ int lowpan_header_compress(struct sk_buff *skb, struct net_device *dev,
        return 0;
 }
 EXPORT_SYMBOL_GPL(lowpan_header_compress);
-
-static int __init lowpan_module_init(void)
-{
-       request_module_nowait("ipv6");
-
-       request_module_nowait("nhc_dest");
-       request_module_nowait("nhc_fragment");
-       request_module_nowait("nhc_hop");
-       request_module_nowait("nhc_ipv6");
-       request_module_nowait("nhc_mobility");
-       request_module_nowait("nhc_routing");
-       request_module_nowait("nhc_udp");
-
-       return 0;
-}
-module_init(lowpan_module_init);
-
-MODULE_LICENSE("GPL");