device: merge branch 'th/device-inital-mac-addr-bgo708820'

System Internals / NetworkManager - Thomas Haller [redhat.com] - 30 June 2016 01:36 UTC

9a354cd device: merge branch 'th/device-inital-mac-addr-bgo708820'

clients/cli/settings.c | 167 +++--
clients/tui/nmt-mac-entry.c | 43 +-
clients/tui/nmt-mac-entry.h | 8 +-
clients/tui/nmt-page-ethernet.c | 2 +-
clients/tui/nmt-page-vlan.c | 2 +-
clients/tui/nmt-page-wifi.c | 4 +-
libnm-core/nm-connection.c | 47 ++
libnm-core/nm-core-internal.h | 12 +
libnm-core/nm-keyfile-reader.c | 67 +-
libnm-core/nm-setting-connection.c | 57 +-
libnm-core/nm-setting-connection.h | 3 +
libnm-core/nm-setting-ip-config.c | 134 +++-
libnm-core/nm-setting-wired.c | 173 +++++-
libnm-core/nm-setting-wired.h | 4 +
libnm-core/nm-setting-wireless.c | 216 ++++++-
libnm-core/nm-setting-wireless.h | 4 +
libnm-core/nm-utils-private.h | 23 +
libnm-core/nm-utils.c | 235 ++++++-
libnm-core/tests/test-general.c | 154 +++++
libnm/libnm.ver | 3 +
man/NetworkManager.conf.xml | 148 ++++-
man/nm-settings-ifcfg-rh.xsl | 5 +
shared/nm-common-macros.h | 15 +
src/NetworkManagerUtils.c | 10 +-
src/devices/bluetooth/nm-device-bt.c | 2 +-
src/devices/nm-device-ethernet.c | 76 +--
src/devices/nm-device-ethernet.h | 1 -
src/devices/nm-device-factory.h | 4 +-
src/devices/nm-device-infiniband.c | 13 +-
src/devices/nm-device-macvlan.c | 29 +-
src/devices/nm-device-private.h | 7 +-
src/devices/nm-device-tun.c | 10 +-
src/devices/nm-device-vlan.c | 55 +-
src/devices/nm-device-vxlan.c | 10 +-
src/devices/nm-device.c | 655 ++++++++++++++++----
src/devices/nm-device.h | 13 +-
src/devices/wifi/nm-device-wifi.c | 175 ++++--
src/devices/wifi/nm-device-wifi.h | 1 -
src/nm-config-data.c | 201 ++++--
src/nm-config-data.h | 11 +
src/nm-config.c | 50 +-
src/nm-config.h | 3 +
src/nm-core-utils.c | 338 +++++++++-
src/nm-core-utils.h | 24 +-
src/nm-iface-helper.c | 22 +-
src/nm-manager.c | 30 +-
src/rdisc/nm-lndp-rdisc.c | 6 +-
src/rdisc/nm-lndp-rdisc.h | 4 +-
src/rdisc/nm-rdisc.c | 7 +-
src/rdisc/nm-rdisc.h | 4 +-
src/rdisc/tests/test-rdisc-linux.c | 1 +
src/settings/nm-settings.c | 8 +-
src/settings/plugins/ifcfg-rh/reader.c | 12 +
src/settings/plugins/ifcfg-rh/writer.c | 22 +-
src/supplicant-manager/nm-supplicant-config.c | 47 --
src/supplicant-manager/nm-supplicant-config.h | 4 -
src/supplicant-manager/nm-supplicant-interface.c | 19 +-
src/supplicant-manager/nm-supplicant-interface.h | 2 -
.../tests/test-supplicant-config.c | 8 -
src/tests/config/nm-test-device.c | 14 +-
src/tests/test-utils.c | 81 ++-
61 files changed, 2760 insertions(+), 745 deletions(-)

Upstream: cgit.freedesktop.org

  • Share