diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 07:22:26 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 07:22:26 -0500 |
| commit | 0f1c122ecfb046c8bac8d93cafc017d7b1aa21c9 (patch) | |
| tree | 4135d9bb556c42359a955e72eb20ff745d9b58bf /include | |
| parent | 2664b25051f7ab96b22b199aa2f5ef6a949a4296 (diff) | |
| parent | 5fad5a2e1f34b333a801b749c4e143c2ac3e8a4f (diff) | |
| download | linux-0f1c122ecfb046c8bac8d93cafc017d7b1aa21c9.tar.gz | |
Merge branch 'upstream-jgarzik' of git://git.tuxdriver.com/git/wireless-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ieee80211_crypt.h | 1 | ||||
| -rw-r--r-- | include/net/iw_handler.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ieee80211_crypt.h b/include/net/ieee80211_crypt.h index 03b766afdc395c..cd82c3e998e428 100644 --- a/include/net/ieee80211_crypt.h +++ b/include/net/ieee80211_crypt.h @@ -25,6 +25,7 @@ #include <linux/types.h> #include <linux/list.h> +#include <net/ieee80211.h> #include <asm/atomic.h> enum { diff --git a/include/net/iw_handler.h b/include/net/iw_handler.h index d67c8393a34371..a2c5e0b88422af 100644 --- a/include/net/iw_handler.h +++ b/include/net/iw_handler.h @@ -327,7 +327,7 @@ struct iw_handler_def __u16 num_private_args; /* Array of handlers for standard ioctls - * We will call dev->wireless_handlers->standard[ioctl - SIOCSIWNAME] + * We will call dev->wireless_handlers->standard[ioctl - SIOCSIWCOMMIT] */ const iw_handler * standard; |