diff options
author | Frederic Weisbecker | 2009-10-18 01:09:09 +0200 |
---|---|---|
committer | Frederic Weisbecker | 2009-10-18 01:12:33 +0200 |
commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a (patch) | |
tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c /drivers/staging/otus/usbdrv.c | |
parent | Merge branch 'linus' into tracing/hw-breakpoints (diff) | |
parent | perf tools: Move dereference after NULL test (diff) | |
download | kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.gz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.xz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.zip |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile
Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
Diffstat (limited to 'drivers/staging/otus/usbdrv.c')
-rw-r--r-- | drivers/staging/otus/usbdrv.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/staging/otus/usbdrv.c b/drivers/staging/otus/usbdrv.c index 7cd87caa6812..48aa30a62164 100644 --- a/drivers/staging/otus/usbdrv.c +++ b/drivers/staging/otus/usbdrv.c @@ -39,9 +39,7 @@ #include "linux/netlink.h" #include "linux/rtnetlink.h" -#if WIRELESS_EXT > 12 #include <net/iw_handler.h> -#endif #ifdef ZM_HOSTAPD_SUPPORT #include "athr_common.h" @@ -113,9 +111,6 @@ extern u8_t zfLnxCreateThread(zdev_t *dev); /* Definition of Wireless Extension */ -#if WIRELESS_EXT > 12 -#include <net/iw_handler.h> -#endif //wireless extension helper functions extern int usbdrv_ioctl_setessid(struct net_device *dev, struct iw_point *erq); extern int usbdrv_ioctl_setrts(struct net_device *dev, struct iw_param *rrq); @@ -203,7 +198,6 @@ struct iw_priv_args usbdrv_private_args[] = { // { SIOCIWFIRSTPRIV + 0xC, 0, IW_PRIV_TYPE_CHAR | 12, "get_mac_mode" }, }; -#if WIRELESS_EXT > 12 static iw_handler usbdrvwext_handler[] = { (iw_handler) NULL, /* SIOCSIWCOMMIT */ (iw_handler) usbdrvwext_giwname, /* SIOCGIWNAME */ @@ -229,13 +223,8 @@ static iw_handler usbdrvwext_handler[] = { (iw_handler) usbdrvwext_giwap, /* SIOCGIWAP */ (iw_handler) NULL, /* -- hole -- */ (iw_handler) usbdrvwext_iwaplist, /* SIOCGIWAPLIST */ -#if WIRELESS_EXT > 13 (iw_handler) usbdrvwext_siwscan, /* SIOCSIWSCAN */ (iw_handler) usbdrvwext_giwscan, /* SIOCGIWSCAN */ -#else /* WIRELESS_EXT > 13 */ - (iw_handler) NULL, /* null */ /* SIOCSIWSCAN */ - (iw_handler) NULL, /* null */ /* SIOCGIWSCAN */ -#endif /* WIRELESS_EXT > 13 */ (iw_handler) usbdrvwext_siwessid, /* SIOCSIWESSID */ (iw_handler) usbdrvwext_giwessid, /* SIOCGIWESSID */ @@ -291,7 +280,6 @@ static struct iw_handler_def p80211wext_handler_def = { .private = (iw_handler *) usbdrv_private_handler, .private_args = (struct iw_priv_args *) usbdrv_private_args }; -#endif /* WDS */ //struct zsWdsStruct wds[ZM_WDS_PORT_NUMBER]; @@ -1106,9 +1094,7 @@ u8_t zfLnxInitSetup(struct net_device *dev, struct usbdrv_private *macp) dev->dev_addr[4] = addr[4]; dev->dev_addr[5] = addr[5]; #endif -#if WIRELESS_EXT > 12 dev->wireless_handlers = (struct iw_handler_def *)&p80211wext_handler_def; -#endif dev->netdev_ops = &otus_netdev_ops; |