From 47527601af164a949b48648cd05db447fdd609c3 Mon Sep 17 00:00:00 2001
From: Tambet Ingo <tambet@gmail.com>
Date: Wed, 15 Apr 2009 11:06:48 -0400
Subject: [PATCH] wifi: don't bring device up if it's rfkilled

---
 src/nm-device-wifi.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c
index 38c49c4290..63c2c9d8bd 100644
--- a/src/nm-device-wifi.c
+++ b/src/nm-device-wifi.c
@@ -976,9 +976,12 @@ real_hw_is_up (NMDevice *device)
 }
 
 static gboolean
-real_hw_bring_up (NMDevice *dev, gboolean *no_firmware)
+real_hw_bring_up (NMDevice *device, gboolean *no_firmware)
 {
-	return nm_system_device_set_up_down (dev, TRUE, no_firmware);
+	if (!NM_DEVICE_WIFI_GET_PRIVATE (device)->enabled)
+		return FALSE;
+
+	return nm_system_device_set_up_down (device, TRUE, no_firmware);
 }
 
 static void