devel/ntopng-zmq: remove port

[bofh]

Summary

Removed as no longer required after ntopng 1.1. Updated upstream version is in the ports tree.

[marino]

on commit message, "Updated upstream version is in the ports tree." => you should say where.
Also, you should explicitly mention that no ports depend on this anymore and that it only existed to support _______ (zmq)?

in other words, the proposed commit is fine, but the commit message is a little bit weak IMO.

[bofh]

Committed revision 378509.

MOVED

 STATIC int sysctl_set_queue_rxthtime(SYSCTL_HANDLER_ARGS);
 STATIC void sysctl_mvneta_init(struct mvneta_softc *);
 
 /* MIB */
 STATIC void mvneta_clear_mib(struct mvneta_softc *);
 STATIC void mvneta_update_mib(struct mvneta_softc *);
 
 /* Switch */
+STATIC boolean_t mvneta_find_ethernet_prop_switch(phandle_t, phandle_t);
 STATIC boolean_t mvneta_has_switch(device_t);
 
 #define mvneta_sc_lock(sc) mtx_lock(&sc->mtx)
 #define mvneta_sc_unlock(sc) mtx_unlock(&sc->mtx)
 
 STATIC struct mtx mii_mutex;
 STATIC int mii_init = 0;
 
 /* Device */
 STATIC int mvneta_detach(device_t);
 /* MII */
#endif
         addr[2] = (mac_h & 0x0000ff00) >> 8;
         addr[3] = (mac_h & 0x000000ff);
         addr[4] = (mac_l & 0x0000ff00) >> 8;
         addr[5] = (mac_l & 0x000000ff);
         return (0);
 }
 
 STATIC boolean_t
-mvneta_has_switch(device_t self)
+mvneta_find_ethernet_prop_switch(phandle_t ethernet, phandle_t node)
 {
-        phandle_t node, switch_node, switch_eth, switch_eth_handle;
+        boolean_t ret;
+        phandle_t child, switch_eth_handle, switch_eth;
 
-        node = ofw_bus_get_node(self);
-        switch_node =
-            ofw_bus_find_compatible(OF_finddevice("/"), "marvell,dsa");
-        switch_eth = 0;
+        for (child = OF_child(node); child != 0; child = OF_peer(child)) {
+                if (OF_getencprop(child, "ethernet", (void*)&switch_eth_handle,
+                    sizeof(switch_eth_handle)) > 0) {
+                        if (switch_eth_handle > 0) {
+                                switch_eth = OF_node_from_xref(
+                                    switch_eth_handle);
 
-        OF_getencprop(switch_node, "dsa,ethernet",
-            (void*)&switch_eth_handle, sizeof(switch_eth_handle));
+                                if (switch_eth == ethernet)
+                                        return (true);
+                        }
+                }
 
-        if (switch_eth_handle > 0)
-                switch_eth = OF_node_from_xref(switch_eth_handle);
+                ret = mvneta_find_ethernet_prop_switch(ethernet, child);
+                if (ret != 0)
+                        return (ret);
+        }
 
-        /* Return true if dsa,ethernet cell points to us */
-        return (node == switch_eth);
+        return (false);
 }
 
+STATIC boolean_t
+mvneta_has_switch(device_t self)
+{
+        phandle_t node;
+
+        node = ofw_bus_get_node(self);
+        return mvneta_find_ethernet_prop_switch(node, OF_finddevice("/"));
+}
+
 STATIC int
 mvneta_dma_create(struct mvneta_softc *sc)
 {
         size_t maxsize, maxsegsz;
         size_t q;
         int error;
 
         /*
if ((sc->phy_addr != MII_PHY_ANY) && (!sc->use_inband_status)) {
                 else
                         ifm_target |= IFM_HDX;
 
                 ifmedia_add(&sc->mvneta_ifmedia, ifm_target, 0, NULL);
                 ifmedia_set(&sc->mvneta_ifmedia, ifm_target);
                 if_link_state_change(sc->ifp, LINK_STATE_UP);
 
                 if (mvneta_has_switch(self)) {
+                        if (bootverbose)
+                                device_printf(self, "This device is attached to a switch\n");
                         child = device_add_child(sc->dev, "mdio", -1);
                         if (child == NULL) {
                                 ether_ifdetach(sc->ifp);
                                 mvneta_detach(self);
                                 return (ENXIO);
                         }
                         bus_generic_attach(sc->dev);
                         bus_generic_attach(child);
+                } else if (bootverbose) {
+                        device_printf(self, "This device is not attached to a switch\n");
                 }
 
                 /* Configure MAC media */
                 mvneta_update_media(sc, ifm_target);
         }
 
         sysctl_mvneta_init(sc);
 

devel/Makefile

 STATIC int sysctl_set_queue_rxthtime(SYSCTL_HANDLER_ARGS);
 STATIC void sysctl_mvneta_init(struct mvneta_softc *);
 
 /* MIB */
 STATIC void mvneta_clear_mib(struct mvneta_softc *);
 STATIC void mvneta_update_mib(struct mvneta_softc *);
 
 /* Switch */
+STATIC boolean_t mvneta_find_ethernet_prop_switch(phandle_t, phandle_t);
 STATIC boolean_t mvneta_has_switch(device_t);
 
 #define mvneta_sc_lock(sc) mtx_lock(&sc->mtx)
 #define mvneta_sc_unlock(sc) mtx_unlock(&sc->mtx)
 
 STATIC struct mtx mii_mutex;
 STATIC int mii_init = 0;
 
 /* Device */
 STATIC int mvneta_detach(device_t);
 /* MII */
#endif
         addr[2] = (mac_h & 0x0000ff00) >> 8;
         addr[3] = (mac_h & 0x000000ff);
         addr[4] = (mac_l & 0x0000ff00) >> 8;
         addr[5] = (mac_l & 0x000000ff);
         return (0);
 }
 
 STATIC boolean_t
-mvneta_has_switch(device_t self)
+mvneta_find_ethernet_prop_switch(phandle_t ethernet, phandle_t node)
 {
-        phandle_t node, switch_node, switch_eth, switch_eth_handle;
+        boolean_t ret;
+        phandle_t child, switch_eth_handle, switch_eth;
 
-        node = ofw_bus_get_node(self);
-        switch_node =
-            ofw_bus_find_compatible(OF_finddevice("/"), "marvell,dsa");
-        switch_eth = 0;
+        for (child = OF_child(node); child != 0; child = OF_peer(child)) {
+                if (OF_getencprop(child, "ethernet", (void*)&switch_eth_handle,
+                    sizeof(switch_eth_handle)) > 0) {
+                        if (switch_eth_handle > 0) {
+                                switch_eth = OF_node_from_xref(
+                                    switch_eth_handle);
 
-        OF_getencprop(switch_node, "dsa,ethernet",
-            (void*)&switch_eth_handle, sizeof(switch_eth_handle));
+                                if (switch_eth == ethernet)
+                                        return (true);
+                        }
+                }
 
-        if (switch_eth_handle > 0)
-                switch_eth = OF_node_from_xref(switch_eth_handle);
+                ret = mvneta_find_ethernet_prop_switch(ethernet, child);
+                if (ret != 0)
+                        return (ret);
+        }
 
-        /* Return true if dsa,ethernet cell points to us */
-        return (node == switch_eth);
+        return (false);
 }
 
+STATIC boolean_t
+mvneta_has_switch(device_t self)
+{
+        phandle_t node;
+
+        node = ofw_bus_get_node(self);
+        return mvneta_find_ethernet_prop_switch(node, OF_finddevice("/"));
+}
+
 STATIC int
 mvneta_dma_create(struct mvneta_softc *sc)
 {
         size_t maxsize, maxsegsz;
         size_t q;
         int error;
 
         /*
if ((sc->phy_addr != MII_PHY_ANY) && (!sc->use_inband_status)) {
                 else
                         ifm_target |= IFM_HDX;
 
                 ifmedia_add(&sc->mvneta_ifmedia, ifm_target, 0, NULL);
                 ifmedia_set(&sc->mvneta_ifmedia, ifm_target);
                 if_link_state_change(sc->ifp, LINK_STATE_UP);
 
                 if (mvneta_has_switch(self)) {
+                        if (bootverbose)
+                                device_printf(self, "This device is attached to a switch\n");
                         child = device_add_child(sc->dev, "mdio", -1);
                         if (child == NULL) {
                                 ether_ifdetach(sc->ifp);
                                 mvneta_detach(self);
                                 return (ENXIO);
                         }
                         bus_generic_attach(sc->dev);
                         bus_generic_attach(child);
+                } else if (bootverbose) {
+                        device_printf(self, "This device is not attached to a switch\n");
                 }
 
                 /* Configure MAC media */
                 mvneta_update_media(sc, ifm_target);
         }
 
         sysctl_mvneta_init(sc);
 

devel/ntopng-zmq/Makefile

 STATIC int sysctl_set_queue_rxthtime(SYSCTL_HANDLER_ARGS);
 STATIC void sysctl_mvneta_init(struct mvneta_softc *);
 
 /* MIB */
 STATIC void mvneta_clear_mib(struct mvneta_softc *);
 STATIC void mvneta_update_mib(struct mvneta_softc *);
 
 /* Switch */
+STATIC boolean_t mvneta_find_ethernet_prop_switch(phandle_t, phandle_t);
 STATIC boolean_t mvneta_has_switch(device_t);
 
 #define mvneta_sc_lock(sc) mtx_lock(&sc->mtx)
 #define mvneta_sc_unlock(sc) mtx_unlock(&sc->mtx)
 
 STATIC struct mtx mii_mutex;
 STATIC int mii_init = 0;
 
 /* Device */
 STATIC int mvneta_detach(device_t);
 /* MII */
#endif
         addr[2] = (mac_h & 0x0000ff00) >> 8;
         addr[3] = (mac_h & 0x000000ff);
         addr[4] = (mac_l & 0x0000ff00) >> 8;
         addr[5] = (mac_l & 0x000000ff);
         return (0);
 }
 
 STATIC boolean_t
-mvneta_has_switch(device_t self)
+mvneta_find_ethernet_prop_switch(phandle_t ethernet, phandle_t node)
 {
-        phandle_t node, switch_node, switch_eth, switch_eth_handle;
+        boolean_t ret;
+        phandle_t child, switch_eth_handle, switch_eth;
 
-        node = ofw_bus_get_node(self);
-        switch_node =
-            ofw_bus_find_compatible(OF_finddevice("/"), "marvell,dsa");
-        switch_eth = 0;
+        for (child = OF_child(node); child != 0; child = OF_peer(child)) {
+                if (OF_getencprop(child, "ethernet", (void*)&switch_eth_handle,
+                    sizeof(switch_eth_handle)) > 0) {
+                        if (switch_eth_handle > 0) {
+                                switch_eth = OF_node_from_xref(
+                                    switch_eth_handle);
 
-        OF_getencprop(switch_node, "dsa,ethernet",
-            (void*)&switch_eth_handle, sizeof(switch_eth_handle));
+                                if (switch_eth == ethernet)
+                                        return (true);
+                        }
+                }
 
-        if (switch_eth_handle > 0)
-                switch_eth = OF_node_from_xref(switch_eth_handle);
+                ret = mvneta_find_ethernet_prop_switch(ethernet, child);
+                if (ret != 0)
+                        return (ret);
+        }
 
-        /* Return true if dsa,ethernet cell points to us */
-        return (node == switch_eth);
+        return (false);
 }
 
+STATIC boolean_t
+mvneta_has_switch(device_t self)
+{
+        phandle_t node;
+
+        node = ofw_bus_get_node(self);
+        return mvneta_find_ethernet_prop_switch(node, OF_finddevice("/"));
+}
+
 STATIC int
 mvneta_dma_create(struct mvneta_softc *sc)
 {
         size_t maxsize, maxsegsz;
         size_t q;
         int error;
 
         /*
if ((sc->phy_addr != MII_PHY_ANY) && (!sc->use_inband_status)) {
                 else
                         ifm_target |= IFM_HDX;
 
                 ifmedia_add(&sc->mvneta_ifmedia, ifm_target, 0, NULL);
                 ifmedia_set(&sc->mvneta_ifmedia, ifm_target);
                 if_link_state_change(sc->ifp, LINK_STATE_UP);
 
                 if (mvneta_has_switch(self)) {
+                        if (bootverbose)
+                                device_printf(self, "This device is attached to a switch\n");
                         child = device_add_child(sc->dev, "mdio", -1);
                         if (child == NULL) {
                                 ether_ifdetach(sc->ifp);
                                 mvneta_detach(self);
                                 return (ENXIO);
                         }
                         bus_generic_attach(sc->dev);
                         bus_generic_attach(child);
+                } else if (bootverbose) {
+                        device_printf(self, "This device is not attached to a switch\n");
                 }
 
                 /* Configure MAC media */
                 mvneta_update_media(sc, ifm_target);
         }
 
         sysctl_mvneta_init(sc);
 

devel/ntopng-zmq/distinfo

 STATIC int sysctl_set_queue_rxthtime(SYSCTL_HANDLER_ARGS);
 STATIC void sysctl_mvneta_init(struct mvneta_softc *);
 
 /* MIB */
 STATIC void mvneta_clear_mib(struct mvneta_softc *);
 STATIC void mvneta_update_mib(struct mvneta_softc *);
 
 /* Switch */
+STATIC boolean_t mvneta_find_ethernet_prop_switch(phandle_t, phandle_t);
 STATIC boolean_t mvneta_has_switch(device_t);
 
 #define mvneta_sc_lock(sc) mtx_lock(&sc->mtx)
 #define mvneta_sc_unlock(sc) mtx_unlock(&sc->mtx)
 
 STATIC struct mtx mii_mutex;
 STATIC int mii_init = 0;
 
 /* Device */
 STATIC int mvneta_detach(device_t);
 /* MII */
#endif
         addr[2] = (mac_h & 0x0000ff00) >> 8;
         addr[3] = (mac_h & 0x000000ff);
         addr[4] = (mac_l & 0x0000ff00) >> 8;
         addr[5] = (mac_l & 0x000000ff);
         return (0);
 }
 
 STATIC boolean_t
-mvneta_has_switch(device_t self)
+mvneta_find_ethernet_prop_switch(phandle_t ethernet, phandle_t node)
 {
-        phandle_t node, switch_node, switch_eth, switch_eth_handle;
+        boolean_t ret;
+        phandle_t child, switch_eth_handle, switch_eth;
 
-        node = ofw_bus_get_node(self);
-        switch_node =
-            ofw_bus_find_compatible(OF_finddevice("/"), "marvell,dsa");
-        switch_eth = 0;
+        for (child = OF_child(node); child != 0; child = OF_peer(child)) {
+                if (OF_getencprop(child, "ethernet", (void*)&switch_eth_handle,
+                    sizeof(switch_eth_handle)) > 0) {
+                        if (switch_eth_handle > 0) {
+                                switch_eth = OF_node_from_xref(
+                                    switch_eth_handle);
 
-        OF_getencprop(switch_node, "dsa,ethernet",
-            (void*)&switch_eth_handle, sizeof(switch_eth_handle));
+                                if (switch_eth == ethernet)
+                                        return (true);
+                        }
+                }
 
-        if (switch_eth_handle > 0)
-                switch_eth = OF_node_from_xref(switch_eth_handle);
+                ret = mvneta_find_ethernet_prop_switch(ethernet, child);
+                if (ret != 0)
+                        return (ret);
+        }
 
-        /* Return true if dsa,ethernet cell points to us */
-        return (node == switch_eth);
+        return (false);
 }
 
+STATIC boolean_t
+mvneta_has_switch(device_t self)
+{
+        phandle_t node;
+
+        node = ofw_bus_get_node(self);
+        return mvneta_find_ethernet_prop_switch(node, OF_finddevice("/"));
+}
+
 STATIC int
 mvneta_dma_create(struct mvneta_softc *sc)
 {
         size_t maxsize, maxsegsz;
         size_t q;
         int error;
 
         /*
if ((sc->phy_addr != MII_PHY_ANY) && (!sc->use_inband_status)) {
                 else
                         ifm_target |= IFM_HDX;
 
                 ifmedia_add(&sc->mvneta_ifmedia, ifm_target, 0, NULL);
                 ifmedia_set(&sc->mvneta_ifmedia, ifm_target);
                 if_link_state_change(sc->ifp, LINK_STATE_UP);
 
                 if (mvneta_has_switch(self)) {
+                        if (bootverbose)
+                                device_printf(self, "This device is attached to a switch\n");
                         child = device_add_child(sc->dev, "mdio", -1);
                         if (child == NULL) {
                                 ether_ifdetach(sc->ifp);
                                 mvneta_detach(self);
                                 return (ENXIO);
                         }
                         bus_generic_attach(sc->dev);
                         bus_generic_attach(child);
+                } else if (bootverbose) {
+                        device_printf(self, "This device is not attached to a switch\n");
                 }
 
                 /* Configure MAC media */
                 mvneta_update_media(sc, ifm_target);
         }
 
         sysctl_mvneta_init(sc);