[Fix][src/service] Add 'fall through' comment when break statement is not needed

[platform/upstream/connman.git] / src / rtnl.c

diff --git a/src/rtnl.c b/src/rtnl.c
old mode 100755 (executable)
new mode 100644 (file)
index ac29f31..aa5c07c
--- a/src/rtnl.c
+++ b/src/rtnl.c
@@ -167,6 +167,7 @@ static void read_uevent(struct interface_data *interface)
        if (ether_blacklisted(name)) {
                interface->service_type = CONNMAN_SERVICE_TYPE_UNKNOWN;
                interface->device_type = CONNMAN_DEVICE_TYPE_UNKNOWN;
+               goto out;
        } else {
                interface->service_type = CONNMAN_SERVICE_TYPE_ETHERNET;
                interface->device_type = CONNMAN_DEVICE_TYPE_ETHERNET;
@@ -462,6 +463,20 @@ static void process_newlink(unsigned short type, int index, unsigned flags,
        if (!extract_link(msg, bytes, &address, &ifname, &mtu, &operstate, &stats))
                return;
 
+#if defined TIZEN_EXT_WIFI_MESH
+       /* Do not accept Wi-Fi Mesh interface */
+       if (g_strrstr(ifname, "mesh") != NULL) {
+               DBG("Newlink event for Wi-Fi Mesh interface ignored");
+               return;
+       }
+
+       /* Do not accept Wi-Fi WLAN1 interface "dedicated for softAP */
+       if (!g_strcmp0(ifname, "wlan1")) {
+               DBG("Newlink event for Wi-Fi WLAN1 interface ignored");
+               return;
+       }
+#endif
+
 #if defined TIZEN_EXT
        /* Do not accept Wi-Fi P2P interface */
        if (g_strrstr(ifname, "p2p") != NULL) {
@@ -1367,10 +1382,10 @@ static void rtnl_newnduseropt(struct nlmsghdr *hdr)
                        DBG("service: %p\n",service);
 #endif
                        servers = rtnl_nd_opt_rdnss(opt, &lifetime,
-                                       &nr_servers);
+                                                               &nr_servers);
                        for (i = 0; i < nr_servers; i++) {
                                if (!inet_ntop(AF_INET6, servers + i, buf,
-                                                       sizeof(buf)))
+                                                               sizeof(buf)))
                                        continue;
 
 #if defined TIZEN_EXT
@@ -1382,7 +1397,7 @@ static void rtnl_newnduseropt(struct nlmsghdr *hdr)
                                                CONNMAN_IPCONFIG_TYPE_IPV6);
 #endif
                                connman_resolver_append_lifetime(index,
-                                               NULL, buf, lifetime);
+                                                       NULL, buf, lifetime);
                        }
 
                } else if (opt->nd_opt_type == 31) { /* ND_OPT_DNSSL */
@@ -1517,7 +1532,7 @@ static void rtnl_message(void *buf, size_t len)
                if (!NLMSG_OK(hdr, len))
                        break;
 
-               DBG("%s len %d type %d flags 0x%04x seq %d pid %d",
+               DBG("%s len %u type %u flags 0x%04x seq %u pid %u",
                                        type2string(hdr->nlmsg_type),
                                        hdr->nlmsg_len, hdr->nlmsg_type,
                                        hdr->nlmsg_flags, hdr->nlmsg_seq,