Skip to content

Commit

Permalink
staging: wean rtl8712 off of its ancient duplicate of if_ether.h
Browse files Browse the repository at this point in the history
This driver should not be carrying around ancient copies of
headers like <linux/if_ether.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>
  • Loading branch information
Paul Gortmaker committed May 10, 2012
1 parent 0e545f6 commit be9a120
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 144 deletions.
141 changes: 0 additions & 141 deletions drivers/staging/rtl8712/if_ether.h

This file was deleted.

3 changes: 2 additions & 1 deletion drivers/staging/rtl8712/rtl8712_recv.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,13 @@

#define _RTL8712_RECV_C_

#include <linux/if_ether.h>

#include "osdep_service.h"
#include "drv_types.h"
#include "recv_osdep.h"
#include "mlme_osdep.h"
#include "ip.h"
#include "if_ether.h"
#include "ethernet.h"
#include "usb_ops.h"
#include "wifi.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/rtl8712/rtl871x_recv.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
#define _RTL871X_RECV_C_

#include <linux/slab.h>
#include <linux/if_ether.h>
#include <linux/kmemleak.h>

#include "osdep_service.h"
#include "drv_types.h"
#include "recv_osdep.h"
#include "mlme_osdep.h"
#include "ip.h"
#include "if_ether.h"
#include "ethernet.h"
#include "usb_ops.h"
#include "wifi.h"
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/rtl8712/xmit_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
#define _XMIT_OSDEP_C_

#include <linux/usb.h>
#include <linux/if_ether.h>

#include "osdep_service.h"
#include "drv_types.h"


#include "if_ether.h"
#include "ip.h"
#include "rtl871x_byteorder.h"
#include "wifi.h"
Expand Down

0 comments on commit be9a120

Please sign in to comment.