diff --git a/src/wtp/binding/ieee80211/wifi_nl80211.c b/src/wtp/binding/ieee80211/wifi_nl80211.c
index bb1f384..22a3d02 100644
--- a/src/wtp/binding/ieee80211/wifi_nl80211.c
+++ b/src/wtp/binding/ieee80211/wifi_nl80211.c
@@ -814,6 +814,19 @@ static int nl80211_wlan_startap(struct wifi_wlan* wlan) {
 		}
 	}
 
+	/* */
+	if (wlan->tunnelmode != CAPWAP_ADD_WLAN_TUNNELMODE_LOCAL) {
+		/* Join interface in kernel module */
+		uint32_t flags = ((wlan->tunnelmode == CAPWAP_ADD_WLAN_TUNNELMODE_80211) ? WTP_KMOD_FLAGS_TUNNEL_NATIVE : WTP_KMOD_FLAGS_TUNNEL_8023);
+
+		if (!wtp_kmod_join_mac80211_device(wlan, flags)) {
+			capwap_logging_info("Joined the interface %d in kernel mode ", wlan->virtindex);
+		} else {
+			capwap_logging_error("Unable to join the interface %d in kernel mode ", wlan->virtindex);
+			return -1;
+		}
+	}
+
 	/* Enable interface */
 	wlan->flags |= WIFI_WLAN_RUNNING;
 	if (wifi_iface_up(wlanhandle->devicehandle->globalhandle->sock_util, wlan->virtname)) {
@@ -832,19 +845,6 @@ static int nl80211_wlan_startap(struct wifi_wlan* wlan) {
 		return -1;
 	}
 
-	/* */
-	if (wlan->tunnelmode != CAPWAP_ADD_WLAN_TUNNELMODE_LOCAL) {
-		/* Join interface in kernel module */
-		uint32_t flags = ((wlan->tunnelmode == CAPWAP_ADD_WLAN_TUNNELMODE_80211) ? WTP_KMOD_FLAGS_TUNNEL_NATIVE : WTP_KMOD_FLAGS_TUNNEL_8023);
-
-		if (!wtp_kmod_join_mac80211_device(wlan, flags)) {
-			capwap_logging_info("Joined the interface %d in kernel mode ", wlan->virtindex);
-		} else {
-			capwap_logging_error("Unable to join the interface %d in kernel mode ", wlan->virtindex);
-			return -1;
-		}
-	}
-
 	/* Enable operation status */
 	wlan->flags |= WIFI_WLAN_OPERSTATE_RUNNING;
 	netlink_set_link_status(wlanhandle->devicehandle->globalhandle->netlinkhandle, wlan->virtindex, -1, IF_OPER_UP);
diff --git a/src/wtp/kmod/netlinkapp.c b/src/wtp/kmod/netlinkapp.c
index 879a46d..cc23d90 100644
--- a/src/wtp/kmod/netlinkapp.c
+++ b/src/wtp/kmod/netlinkapp.c
@@ -121,28 +121,45 @@ error:
 static struct sc_netlink_device* sc_netlink_new_device(struct net *net, uint32_t ifindex,
 						       uint8_t radioid, u8 wlanid, uint8_t binding)
 {
+	int err = 0;
 	struct net_device* dev;
 	struct sc_netlink_device* nldev;
+	struct inet6_dev *idev;
 
 	TRACEKMOD("### sc_netlink_new_device\n");
 
 	/* Retrieve device from ifindex */
 	dev = dev_get_by_index(net, ifindex);
-	if (!dev) {
-		return NULL;
-	}
+	if (!dev)
+		return ERR_PTR(-ENODEV);
 
 	/* Check if wireless device */
-	if (!dev->ieee80211_ptr || !dev->ieee80211_ptr->wiphy) {
-		dev_put(dev);
-		return NULL;
+	if (!dev->ieee80211_ptr ||
+	    !dev->ieee80211_ptr->wiphy) {
+		err = -ENODEV;
+		goto out_err;
 	}
 
+	if (unlikely(dev->flags & IFF_UP)) {
+		err = -EINVAL;
+		goto out_err;
+	}
+
+	idev = __in6_dev_get(dev);
+	if (!idev) {
+		err = -ENODEV;
+		goto out_err;
+	}
+
+	/* disable IPv6 on this iface */
+	printk("SmartCAPWAP: disabling IPv6 on %s\n", dev->name);
+	idev->cnf.disable_ipv6 = 1;
+
 	/* Create device */
 	nldev = (struct sc_netlink_device*)kzalloc(sizeof(struct sc_netlink_device), GFP_KERNEL);
 	if (!nldev) {
-		dev_put(dev);
-		return NULL;
+		err = -ENOMEM;
+		goto out_err;
 	}
 
 	/* Initialize device */
@@ -156,6 +173,10 @@ static struct sc_netlink_device* sc_netlink_new_device(struct net *net, uint32_t
 	nldev->net = net;
 
 	return nldev;
+
+out_err:
+	dev_put(dev);
+	return ERR_PTR(err);
 }
 
 /* */
@@ -199,9 +220,8 @@ sc_netlink_register_device(struct net *net, uint32_t ifindex, uint8_t radioid,
 
 	/* Create device */
 	nldev = sc_netlink_new_device(net, ifindex, radioid, wlanid, binding);
-	if (nldev) {
+	if (!IS_ERR(nldev))
 		list_add_rcu(&nldev->list, &sn->sc_netlink_dev_list);
-	}
 
 	return nldev;
 }
@@ -533,9 +553,8 @@ static int sc_netlink_join_mac80211_device(struct sk_buff* skb, struct genl_info
 					   nla_get_u8(info->attrs[NLSMARTCAPWAP_ATTR_RADIOID]),
 					   nla_get_u8(info->attrs[NLSMARTCAPWAP_ATTR_WLANID]),
 					   nla_get_u8(info->attrs[NLSMARTCAPWAP_ATTR_BINDING]));
-	if (!nldev) {
-		return -EINVAL;
-	}
+	if (IS_ERR(nldev))
+		PTR_ERR(nldev);
 
 	/* */
 	if (info->attrs[NLSMARTCAPWAP_ATTR_FLAGS]) {
@@ -943,7 +962,7 @@ int __init sc_netlink_init(void) {
 	if (ret)
 		goto unreg_genl_family;
 
-	pr_info("smartCAPWAP module loaded");
+	pr_info("smartCAPWAP module loaded\n");
  	return 0;
 
 unreg_genl_family: