diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-20 17:36:10 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-20 17:36:10 -0400 |
| commit | f18b95c3e2ab0f75b23a5aabab0bc8f99bd6bbf3 (patch) | |
| tree | 9ff4b7efdb2ca1e83c2a413f06268b268098b3ca /include | |
| parent | 17c281ab3e33be63693687d3db7ac9cf2bbdfd66 (diff) | |
| parent | 848ef8555296f25d9226d3bc43ce4028835ed633 (diff) | |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ieee80211softmac.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h index b971d8c82bdd..6b3693f05ca0 100644 --- a/include/net/ieee80211softmac.h +++ b/include/net/ieee80211softmac.h | |||
| @@ -267,8 +267,9 @@ extern void ieee80211softmac_stop(struct net_device *dev); | |||
| 267 | #define IEEE80211SOFTMAC_EVENT_AUTH_FAILED 5 | 267 | #define IEEE80211SOFTMAC_EVENT_AUTH_FAILED 5 |
| 268 | #define IEEE80211SOFTMAC_EVENT_AUTH_TIMEOUT 6 | 268 | #define IEEE80211SOFTMAC_EVENT_AUTH_TIMEOUT 6 |
| 269 | #define IEEE80211SOFTMAC_EVENT_ASSOCIATE_NET_NOT_FOUND 7 | 269 | #define IEEE80211SOFTMAC_EVENT_ASSOCIATE_NET_NOT_FOUND 7 |
| 270 | #define IEEE80211SOFTMAC_EVENT_DISASSOCIATED 8 | ||
| 270 | /* keep this updated! */ | 271 | /* keep this updated! */ |
| 271 | #define IEEE80211SOFTMAC_EVENT_LAST 7 | 272 | #define IEEE80211SOFTMAC_EVENT_LAST 8 |
| 272 | /* | 273 | /* |
| 273 | * If you want to be notified of certain events, you can call | 274 | * If you want to be notified of certain events, you can call |
| 274 | * ieee80211softmac_notify[_atomic] with | 275 | * ieee80211softmac_notify[_atomic] with |