summary refs log tree commit diff
path: root/libnm/nm-device-bridge.c
diff options
context:
space:
mode:
Diffstat (limited to 'libnm/nm-device-bridge.c')
-rw-r--r--libnm/nm-device-bridge.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c
index 55f09a20..27f362b2 100644
--- a/libnm/nm-device-bridge.c
+++ b/libnm/nm-device-bridge.c
@@ -107,9 +107,14 @@ connection_compatible (NMDevice *device, NMConnection *connection, GError **erro
 		return FALSE;
 
 	if (!nm_connection_is_type (connection, NM_SETTING_BRIDGE_SETTING_NAME)) {
-		g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
-		                     _("The connection was not a bridge connection."));
-		return FALSE;
+		if (   _nm_connection_get_setting_bluetooth_for_nap (connection)
+		    && nm_connection_is_type (connection, NM_SETTING_BLUETOOTH_SETTING_NAME)) {
+			/* a bluetooth NAP setting is a compatible connection for a bridge. */
+		} else {
+			g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
+			                     _("The connection was not a bridge connection."));
+			return FALSE;
+		}
 	}
 
 	/* FIXME: check ports? */