diff options
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_iw.c | 1 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 1 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wl_mac80211.h | 2 | ||||
-rw-r--r-- | drivers/staging/et131x/et131x_netdev.c | 1 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 9 | ||||
-rw-r--r-- | drivers/staging/pohmelfs/crypto.c | 1 | ||||
-rw-r--r-- | drivers/staging/rtl8187se/ieee80211/ieee80211.h | 1 | ||||
-rw-r--r-- | drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c | 1 | ||||
-rw-r--r-- | drivers/staging/rtl8187se/r8180.h | 1 | ||||
-rw-r--r-- | drivers/staging/rtl8187se/r8180_core.c | 1 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/ieee80211/ieee80211.h | 1 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/r8192E.h | 1 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/r8192E_core.c | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8192u/ieee80211/ieee80211.h | 1 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/wl_internal.h | 7 |
16 files changed, 16 insertions, 17 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index f356c564cfb..09957bd6b79 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -31,6 +31,8 @@ #include <linux/fcntl.h> #include <linux/fs.h> #include <linux/uaccess.h> +#include <linux/interrupt.h> +#include <linux/hardirq.h> #include <bcmdefs.h> #include <bcmutils.h> diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c index 15e1b05ca92..35eec917f23 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c @@ -18,6 +18,7 @@ #include <linux/semaphore.h> #include <bcmdefs.h> #include <linux/netdevice.h> +#include <linux/hardirq.h> #include <wlioctl.h> #include <bcmutils.h> diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c index 6c6236c969b..82612290b99 100644 --- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c +++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c @@ -24,6 +24,7 @@ #include <linux/pci.h> #include <linux/sched.h> #include <linux/firmware.h> +#include <linux/interrupt.h> #include <net/mac80211.h> #include <proto/802.11.h> diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h index e703d8bb94d..f7a58b7a550 100644 --- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h +++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h @@ -17,6 +17,8 @@ #ifndef _wl_mac80211_h_ #define _wl_mac80211_h_ +#include <linux/interrupt.h> + /* BMAC Note: High-only driver is no longer working in softirq context as it needs to block and * sleep so perimeter lock has to be a semaphore instead of spinlock. This requires timers to be * submitted to workqueue instead of being on kernel timer diff --git a/drivers/staging/et131x/et131x_netdev.c b/drivers/staging/et131x/et131x_netdev.c index b25bae29042..95555d25fcb 100644 --- a/drivers/staging/et131x/et131x_netdev.c +++ b/drivers/staging/et131x/et131x_netdev.c @@ -97,7 +97,6 @@ int et131x_tx(struct sk_buff *skb, struct net_device *netdev); void et131x_tx_timeout(struct net_device *netdev); int et131x_change_mtu(struct net_device *netdev, int new_mtu); int et131x_set_mac_addr(struct net_device *netdev, void *new_mac); -void et131x_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp); void et131x_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid); void et131x_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid); diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c index b0a4211f43a..3f303ea1433 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c @@ -671,7 +671,6 @@ static int ft1000_reset_card(struct net_device *dev) return TRUE; } -#ifdef HAVE_NET_DEVICE_OPS static const struct net_device_ops ftnet_ops = { .ndo_open = &ft1000_open, @@ -679,7 +678,6 @@ static const struct net_device_ops ftnet_ops = .ndo_start_xmit = &ft1000_start_xmit, .ndo_get_stats = &ft1000_netdev_stats, }; -#endif //--------------------------------------------------------------------------- @@ -764,14 +762,7 @@ int init_ft1000_netdev(struct ft1000_device *ft1000dev) INIT_LIST_HEAD(&pInfo->nodes.list); -#ifdef HAVE_NET_DEVICE_OPS netdev->netdev_ops = &ftnet_ops; -#else - netdev->hard_start_xmit = &ft1000_start_xmit; - netdev->get_stats = &ft1000_netdev_stats; - netdev->open = &ft1000_open; - netdev->stop = &ft1000_close; -#endif ft1000dev->net = netdev; diff --git a/drivers/staging/pohmelfs/crypto.c b/drivers/staging/pohmelfs/crypto.c index 5cca24fcf6c..ad92771dce5 100644 --- a/drivers/staging/pohmelfs/crypto.c +++ b/drivers/staging/pohmelfs/crypto.c @@ -17,6 +17,7 @@ #include <linux/highmem.h> #include <linux/kthread.h> #include <linux/pagemap.h> +#include <linux/scatterlist.h> #include <linux/slab.h> #include "netfs.h" diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211.h b/drivers/staging/rtl8187se/ieee80211/ieee80211.h index 16aa6a8952f..4384d9358c4 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211.h @@ -32,6 +32,7 @@ #include <linux/semaphore.h> #include <linux/wireless.h> #include <linux/ieee80211.h> +#include <linux/interrupt.h> #define KEY_TYPE_NA 0x0 #define KEY_TYPE_WEP40 0x1 diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c index 736a1404f28..00ee02f841a 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c @@ -20,6 +20,7 @@ #include <linux/delay.h> #include <linux/slab.h> #include <linux/version.h> +#include <linux/interrupt.h> #include <asm/uaccess.h> #include "dot11d.h" diff --git a/drivers/staging/rtl8187se/r8180.h b/drivers/staging/rtl8187se/r8180.h index d15bdf64efd..a2c46ae4a40 100644 --- a/drivers/staging/rtl8187se/r8180.h +++ b/drivers/staging/rtl8187se/r8180.h @@ -18,6 +18,7 @@ #ifndef R8180H #define R8180H +#include <linux/interrupt.h> #define RTL8180_MODULE_NAME "r8180" #define DMESG(x,a...) printk(KERN_INFO RTL8180_MODULE_NAME ": " x "\n", ## a) diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c index 2155a771c33..bae7d85fe83 100644 --- a/drivers/staging/rtl8187se/r8180_core.c +++ b/drivers/staging/rtl8187se/r8180_core.c @@ -33,6 +33,7 @@ #include <linux/slab.h> #include <linux/syscalls.h> #include <linux/eeprom_93cx6.h> +#include <linux/interrupt.h> #include "r8180_hw.h" #include "r8180.h" diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211.h b/drivers/staging/rtl8192e/ieee80211/ieee80211.h index dbe21ab0dbf..82bc59a8be0 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211.h @@ -31,6 +31,7 @@ #include <linux/timer.h> #include <linux/sched.h> #include <linux/semaphore.h> +#include <linux/interrupt.h> #include <linux/delay.h> #include <linux/wireless.h> diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h index 0229031d88d..89fe8fc3d6c 100644 --- a/drivers/staging/rtl8192e/r8192E.h +++ b/drivers/staging/rtl8192e/r8192E.h @@ -36,6 +36,7 @@ #include <linux/if_arp.h> #include <linux/random.h> #include <linux/version.h> +#include <linux/interrupt.h> #include <asm/io.h> #include "ieee80211/rtl819x_HT.h" #include "ieee80211/ieee80211.h" diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index 58d800f1b5e..19a9a07224a 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c @@ -27,6 +27,8 @@ #include <linux/vmalloc.h> #include <linux/slab.h> +#include <linux/interrupt.h> +#include <linux/hardirq.h> #include <asm/uaccess.h> #include "r8192E_hw.h" #include "r8192E.h" diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h index e716f7b1144..23332571c3c 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h @@ -31,6 +31,7 @@ #include <linux/timer.h> #include <linux/sched.h> #include <linux/semaphore.h> +#include <linux/interrupt.h> #include <linux/delay.h> #include <linux/wireless.h> diff --git a/drivers/staging/wlags49_h2/wl_internal.h b/drivers/staging/wlags49_h2/wl_internal.h index cd129b3ee6c..e86aad53b53 100644 --- a/drivers/staging/wlags49_h2/wl_internal.h +++ b/drivers/staging/wlags49_h2/wl_internal.h @@ -990,14 +990,7 @@ struct wl_private #endif // USE_WDS }; // wl_private -#ifdef HAVE_NETDEV_PRIV #define wl_priv(dev) ((struct wl_private *) netdev_priv(dev)) -#else -extern inline struct wl_private *wl_priv(struct net_device *dev) -{ - return dev->priv; -} -#endif /********************************************************************/ /* Locking and synchronization functions */ |