From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: linux-wireless@vger.kernel.org
Cc: florian.c.schilhabel@googlemail.com, ali@internetdog.org,
netdev@vger.kernel.org,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Larry Finger <Larry.Finger@lwfinger.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH 2/3] staging: wean rtl8712 off of its ancient duplicate of ip.h
Date: Wed, 9 May 2012 23:47:20 -0400 [thread overview]
Message-ID: <1336621641-15467-3-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1336621641-15467-1-git-send-email-paul.gortmaker@windriver.com>
This driver should not be carrying around ancient copies of
headers like <linux/ip.h> for its own use. Mapping it onto
the mainline one uncovers no build issues.
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/staging/rtl8712/ip.h | 137 --------------------------------
drivers/staging/rtl8712/rtl8712_recv.c | 2 +-
drivers/staging/rtl8712/rtl871x_recv.c | 2 +-
drivers/staging/rtl8712/xmit_linux.c | 3 +-
4 files changed, 3 insertions(+), 141 deletions(-)
delete mode 100644 drivers/staging/rtl8712/ip.h
diff --git a/drivers/staging/rtl8712/ip.h b/drivers/staging/rtl8712/ip.h
deleted file mode 100644
index f37b0f8..0000000
diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c
index b2a7714..e975d0a 100644
--- a/drivers/staging/rtl8712/rtl8712_recv.c
+++ b/drivers/staging/rtl8712/rtl8712_recv.c
@@ -29,12 +29,12 @@
#define _RTL8712_RECV_C_
#include <linux/if_ether.h>
+#include <linux/ip.h>
#include "osdep_service.h"
#include "drv_types.h"
#include "recv_osdep.h"
#include "mlme_osdep.h"
-#include "ip.h"
#include "ethernet.h"
#include "usb_ops.h"
#include "wifi.h"
diff --git a/drivers/staging/rtl8712/rtl871x_recv.c b/drivers/staging/rtl8712/rtl871x_recv.c
index 7376abb..c9d1743 100644
--- a/drivers/staging/rtl8712/rtl871x_recv.c
+++ b/drivers/staging/rtl8712/rtl871x_recv.c
@@ -28,6 +28,7 @@
#define _RTL871X_RECV_C_
+#include <linux/ip.h>
#include <linux/slab.h>
#include <linux/if_ether.h>
#include <linux/kmemleak.h>
@@ -36,7 +37,6 @@
#include "drv_types.h"
#include "recv_osdep.h"
#include "mlme_osdep.h"
-#include "ip.h"
#include "ethernet.h"
#include "usb_ops.h"
#include "wifi.h"
diff --git a/drivers/staging/rtl8712/xmit_linux.c b/drivers/staging/rtl8712/xmit_linux.c
index d27f652..c6943c5 100644
--- a/drivers/staging/rtl8712/xmit_linux.c
+++ b/drivers/staging/rtl8712/xmit_linux.c
@@ -29,13 +29,12 @@
#define _XMIT_OSDEP_C_
#include <linux/usb.h>
+#include <linux/ip.h>
#include <linux/if_ether.h>
#include "osdep_service.h"
#include "drv_types.h"
-
-#include "ip.h"
#include "rtl871x_byteorder.h"
#include "wifi.h"
#include "mlme_osdep.h"
--
1.7.9.1
next prev parent reply other threads:[~2012-05-10 3:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-10 3:47 [PATCH 0/3] staging: delete duplicated files/functionality in rtl8712 Paul Gortmaker
2012-05-10 3:47 ` [PATCH 1/3] staging: wean rtl8712 off of its ancient duplicate of if_ether.h Paul Gortmaker
2012-05-10 3:47 ` Paul Gortmaker [this message]
2012-05-10 3:47 ` [PATCH 3/3] staging: delete all duplicated endian crap from rtl8712 driver Paul Gortmaker
2012-05-10 16:54 ` [PATCH 0/3] staging: delete duplicated files/functionality in rtl8712 Greg Kroah-Hartman
[not found] ` <20120510165451.GA12958-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2012-05-10 17:31 ` Paul Gortmaker
[not found] ` <20120510173139.GA16704-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org>
2012-05-10 18:11 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1336621641-15467-3-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=Larry.Finger@lwfinger.net \
--cc=ali@internetdog.org \
--cc=florian.c.schilhabel@googlemail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).