diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-31 11:50:55 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-31 11:50:55 -0500 |
| commit | 0b310f36d7d96e27f6941ec0f9b95e15142f1e78 (patch) | |
| tree | c2a3d403c82fd892ded3849cc721cf8e6f8c7824 /include | |
| parent | 359b8800d3a46557844969c485e1a14baf119b06 (diff) | |
| parent | 2f633db5e9c57e07a971b65e9a72f090f59fd5f6 (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ieee80211.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index ff6ef9e1a691..4725ff861c57 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h | |||
| @@ -1285,6 +1285,14 @@ extern int ieee80211_wx_set_encodeext(struct ieee80211_device *ieee, | |||
| 1285 | extern int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee, | 1285 | extern int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee, |
| 1286 | struct iw_request_info *info, | 1286 | struct iw_request_info *info, |
| 1287 | union iwreq_data *wrqu, char *extra); | 1287 | union iwreq_data *wrqu, char *extra); |
| 1288 | extern int ieee80211_wx_set_auth(struct net_device *dev, | ||
| 1289 | struct iw_request_info *info, | ||
| 1290 | union iwreq_data *wrqu, | ||
| 1291 | char *extra); | ||
| 1292 | extern int ieee80211_wx_get_auth(struct net_device *dev, | ||
| 1293 | struct iw_request_info *info, | ||
| 1294 | union iwreq_data *wrqu, | ||
| 1295 | char *extra); | ||
| 1288 | 1296 | ||
| 1289 | static inline void ieee80211_increment_scans(struct ieee80211_device *ieee) | 1297 | static inline void ieee80211_increment_scans(struct ieee80211_device *ieee) |
| 1290 | { | 1298 | { |