Commit 1a3bf747 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Staging: brcm80211: remove some more macros from linuxver.h

These aren't needed anymore, and now we are down to just one broken one,
and a whole bunch of #include files here.  This can be further factored
by moving the proper #includes into the different .c files, and not
leaving them in this one large one.

Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f149e6f1
...@@ -404,7 +404,7 @@ osl_pkt_tonative(osl_pubinfo_t *osh, void *pkt) ...@@ -404,7 +404,7 @@ osl_pkt_tonative(osl_pubinfo_t *osh, void *pkt)
#define PKTSETLINK(skb, x) (((struct sk_buff *)(skb))->prev = (struct sk_buff*)(x)) #define PKTSETLINK(skb, x) (((struct sk_buff *)(skb))->prev = (struct sk_buff*)(x))
#define PKTPRIO(skb) (((struct sk_buff *)(skb))->priority) #define PKTPRIO(skb) (((struct sk_buff *)(skb))->priority)
#define PKTSETPRIO(skb, x) (((struct sk_buff *)(skb))->priority = (x)) #define PKTSETPRIO(skb, x) (((struct sk_buff *)(skb))->priority = (x))
#define PKTSUMNEEDED(skb) (((struct sk_buff *)(skb))->ip_summed == CHECKSUM_HW) #define PKTSUMNEEDED(skb) (((struct sk_buff *)(skb))->ip_summed == CHECKSUM_PARTIAL)
#define PKTSETSUMGOOD(skb, x) (((struct sk_buff *)(skb))->ip_summed = \ #define PKTSETSUMGOOD(skb, x) (((struct sk_buff *)(skb))->ip_summed = \
((x) ? CHECKSUM_UNNECESSARY : CHECKSUM_NONE)) ((x) ? CHECKSUM_UNNECESSARY : CHECKSUM_NONE))
/* PKTSETSUMNEEDED and PKTSUMGOOD are not possible because skb->ip_summed is overloaded */ /* PKTSETSUMNEEDED and PKTSUMGOOD are not possible because skb->ip_summed is overloaded */
......
...@@ -17,11 +17,8 @@ ...@@ -17,11 +17,8 @@
#ifndef _linuxver_h_ #ifndef _linuxver_h_
#define _linuxver_h_ #define _linuxver_h_
#include <linux/version.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/mm.h> #include <linux/mm.h>
...@@ -29,18 +26,15 @@ ...@@ -29,18 +26,15 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#undef IP_TOS
#include <asm/io.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/ieee80211.h> #include <linux/ieee80211.h>
#define CHECKSUM_HW CHECKSUM_PARTIAL
#include <linux/time.h> #include <linux/time.h>
#include <linux/wait.h> #include <linux/wait.h>
#undef IP_TOS
#include <asm/io.h>
#define KILL_PROC(nr, sig) \ #define KILL_PROC(nr, sig) \
do { \ do { \
struct task_struct *tsk; \ struct task_struct *tsk; \
...@@ -51,6 +45,4 @@ ...@@ -51,6 +45,4 @@
send_sig(sig, tsk, 1); \ send_sig(sig, tsk, 1); \
} while (0) } while (0)
#define WL_DEV_IF(dev) ((wl_if_t *)netdev_priv(dev))
#endif /* _linuxver_h_ */ #endif /* _linuxver_h_ */
...@@ -135,6 +135,7 @@ struct ieee80211_tkip_data { ...@@ -135,6 +135,7 @@ struct ieee80211_tkip_data {
}; };
#ifndef WLC_HIGH_ONLY #ifndef WLC_HIGH_ONLY
#define WL_DEV_IF(dev) ((wl_if_t *)netdev_priv(dev))
#define WL_INFO(dev) ((wl_info_t *)(WL_DEV_IF(dev)->wl)) /* points to wl */ #define WL_INFO(dev) ((wl_info_t *)(WL_DEV_IF(dev)->wl)) /* points to wl */
static int wl_request_fw(wl_info_t *wl, struct pci_dev *pdev); static int wl_request_fw(wl_info_t *wl, struct pci_dev *pdev);
static void wl_release_fw(wl_info_t *wl); static void wl_release_fw(wl_info_t *wl);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment