From f6f8ff1c33307e36ca1884a1fed81c6a69a61448 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Mon, 12 Dec 2011 11:42:39 -0600
Subject: [PATCH] wifi: kill wireless-helper.h

Only used in wifi-utils-wext.c now.
---
 src/Makefile.am       |  1 -
 src/wifi-utils-wext.c | 11 ++++++++++-
 src/wireless-helper.h | 32 --------------------------------
 3 files changed, 10 insertions(+), 34 deletions(-)
 delete mode 100644 src/wireless-helper.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 316fdc426d..44e07f7176 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -114,7 +114,6 @@ NetworkManager_SOURCES = \
 		nm-device-private.h \
 		nm-device-ethernet.c \
 		nm-device-ethernet.h \
-		wireless-helper.h \
 		wifi-utils.c \
 		wifi-utils.h \
 		wifi-utils-private.h \
diff --git a/src/wifi-utils-wext.c b/src/wifi-utils-wext.c
index c570f848c6..75d00f4120 100644
--- a/src/wifi-utils-wext.c
+++ b/src/wifi-utils-wext.c
@@ -34,7 +34,16 @@
 #include "nm-logging.h"
 #include "nm-utils.h"
 
-#include "wireless-helper.h"
+/* Hacks necessary to #include wireless.h; yay for WEXT */
+#ifndef __user
+#define __user
+#endif
+#include <sys/types.h>
+#include <linux/types.h>
+#include <sys/socket.h>
+#include <linux/if.h>
+#include <linux/wireless.h>
+
 
 typedef struct {
 	WifiData parent;
diff --git a/src/wireless-helper.h b/src/wireless-helper.h
deleted file mode 100644
index e6f059f3a0..0000000000
--- a/src/wireless-helper.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* NetworkManager -- Network link manager
- *
- * Dan Williams <dcbw@redhat.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2008 Red Hat, Inc.
- */
-
-/* Hacks necessary to #include wireless.h; yay for WEXT */
-
-#ifndef __user
-#define __user
-#endif
-#include <sys/types.h>
-#include <linux/types.h>
-#include <sys/socket.h>
-#include <linux/if.h>
-#include <linux/wireless.h>
-