Commit a1eb5eba authored by Thomas Haller's avatar Thomas Haller

all: merge branch 'jk/device-types'

Resurrect old branch by Jirka, rebase it and
merge some parts.
parents b875ac34 8852b219
......@@ -36,6 +36,10 @@ devtypes = { 1: "Ethernet",
13: "Bridge",
14: "Generic",
15: "Team"
16: "TUN"
17: "IPTunnel"
18: "MACVLAN"
19: "VXLAN"
}
states = { 0: "Unknown",
......
......@@ -38,7 +38,11 @@ devtypes = { 1 => "Ethernet",
12 => "ADSL",
13 => "Bridge",
14 => "Generic",
15 => "Team"
15 => "Team",
16 => "TUN",
17 => "IPTunnel",
18 => "MACVLAN",
19 => "VXLAN",
}
states = { 0 => "Unknown",
......
......@@ -48,6 +48,10 @@ devtype_to_name()
13) echo "Bridge" ;;
14) echo "Generic" ;;
15) echo "Team" ;;
16) echo "TUN" ;;
17) echo "IPTunnel" ;;
18) echo "MACVLAN" ;;
19) echo "VXLAN" ;;
*) echo "Unknown" ;;
esac
}
......
......@@ -6,7 +6,7 @@
<tp:version>@VERSION@</tp:version>
<tp:copyright>Copyright (C) 2008 - 2011 Red Hat, Inc.</tp:copyright>
<tp:copyright>Copyright (C) 2008 - 2016 Red Hat, Inc.</tp:copyright>
<tp:copyright>Copyright (C) 2008 - 2009 Novell, Inc.</tp:copyright>
<tp:license xmlns="http://www.w3.org/1999/xhtml">
......@@ -28,19 +28,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<xi:include href="nm-manager.xml"/>
<xi:include href="nm-access-point.xml"/>
<xi:include href="nm-device.xml"/>
<xi:include href="nm-device-adsl.xml"/>
<xi:include href="nm-device-bond.xml"/>
<xi:include href="nm-device-bridge.xml"/>
<xi:include href="nm-device-bt.xml"/>
<xi:include href="nm-device-ethernet.xml"/>
<xi:include href="nm-device-wifi.xml"/>
<xi:include href="nm-device-generic.xml"/>
<xi:include href="nm-device-infiniband.xml"/>
<xi:include href="nm-device-ip-tunnel.xml"/>
<xi:include href="nm-device-macvlan.xml"/>
<xi:include href="nm-device-modem.xml"/>
<xi:include href="nm-device-bt.xml"/>
<xi:include href="nm-device-olpc-mesh.xml"/>
<xi:include href="nm-device-wimax.xml"/>
<xi:include href="nm-device-infiniband.xml"/>
<xi:include href="nm-device-bond.xml"/>
<xi:include href="nm-device-bridge.xml"/>
<xi:include href="nm-device-team.xml"/>
<xi:include href="nm-device-generic.xml"/>
<xi:include href="nm-device-tun.xml"/>
<xi:include href="nm-device-veth.xml"/>
<xi:include href="nm-device-vlan.xml"/>
<xi:include href="nm-device-adsl.xml"/>
<xi:include href="nm-device-vxlan.xml"/>
<xi:include href="nm-device-wifi.xml"/>
<xi:include href="nm-device-wimax.xml"/>
<xi:include href="nm-wimax-nsp.xml"/>
<xi:include href="nm-ip4-config.xml"/>
<xi:include href="nm-ip6-config.xml"/>
......
......@@ -153,6 +153,8 @@ typedef enum {
* @NM_DEVICE_TYPE_TEAM: a team master interface
* @NM_DEVICE_TYPE_TUN: a TUN/TAP interface
* @NM_DEVICE_TYPE_IP_TUNNEL: an IP tunnel interface
* @NM_DEVICE_TYPE_MACVLAN: a MACVLAN interface
* @NM_DEVICE_TYPE_VXLAN: a VXLAN interface
*
* #NMDeviceType values indicate the type of hardware represented by
* an #NMDevice.
......@@ -178,6 +180,8 @@ typedef enum {
NM_DEVICE_TYPE_TEAM = 15,
NM_DEVICE_TYPE_TUN = 16,
NM_DEVICE_TYPE_IP_TUNNEL = 17,
NM_DEVICE_TYPE_MACVLAN = 18,
NM_DEVICE_TYPE_VXLAN = 19,
} NMDeviceType;
/**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment