diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-12-07 05:02:40 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-12-07 05:02:40 -0500 |
| commit | 359f2d17e32b32f53577375f83fb06d34e31bfe8 (patch) | |
| tree | 2890ffcf40fab2d2c24d2d208814afeb52bb12e5 /net/ieee80211/softmac/ieee80211softmac_priv.h | |
| parent | 0efdf2626676db4b30d343ff88f8461ad09130da (diff) | |
| parent | 720eeb4332e5871c97d390b2fb55a5a74fb18ae6 (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Conflicts:
drivers/net/wireless/zd1211rw/zd_mac.h
net/ieee80211/softmac/ieee80211softmac_assoc.c
Diffstat (limited to 'net/ieee80211/softmac/ieee80211softmac_priv.h')
| -rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_priv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_priv.h b/net/ieee80211/softmac/ieee80211softmac_priv.h index c0dbe070e548..4c2bba34d328 100644 --- a/net/ieee80211/softmac/ieee80211softmac_priv.h +++ b/net/ieee80211/softmac/ieee80211softmac_priv.h | |||
| @@ -239,4 +239,6 @@ void ieee80211softmac_call_events_locked(struct ieee80211softmac_device *mac, in | |||
| 239 | int ieee80211softmac_notify_internal(struct ieee80211softmac_device *mac, | 239 | int ieee80211softmac_notify_internal(struct ieee80211softmac_device *mac, |
| 240 | int event, void *event_context, notify_function_ptr fun, void *context, gfp_t gfp_mask); | 240 | int event, void *event_context, notify_function_ptr fun, void *context, gfp_t gfp_mask); |
| 241 | 241 | ||
| 242 | void ieee80211softmac_try_reassoc(struct ieee80211softmac_device *mac); | ||
| 243 | |||
| 242 | #endif /* IEEE80211SOFTMAC_PRIV_H_ */ | 244 | #endif /* IEEE80211SOFTMAC_PRIV_H_ */ |