diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-16 19:16:59 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-16 19:16:59 -0500 |
commit | b27a1ed571e12e7ec75b8907bf02fd69fd2bfe10 (patch) | |
tree | e5b305e07c559f92275cbd902bda70aeaeca7346 /net/ieee80211/ieee80211_rx.c | |
parent | ca68bb1e41c4937fc125d3917dd1feadc493d850 (diff) | |
parent | 72df16f109b73be37977a26d342e9103e8851cb6 (diff) | |
download | kernel-crypto-b27a1ed571e12e7ec75b8907bf02fd69fd2bfe10.tar.gz kernel-crypto-b27a1ed571e12e7ec75b8907bf02fd69fd2bfe10.tar.xz kernel-crypto-b27a1ed571e12e7ec75b8907bf02fd69fd2bfe10.zip |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/ieee80211/ieee80211_rx.c')
-rw-r--r-- | net/ieee80211/ieee80211_rx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index b410ab8bcf7..7ac6a7165d9 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c @@ -1417,10 +1417,10 @@ static void ieee80211_process_probe_response(struct ieee80211_device if (is_beacon(beacon->header.frame_ctl)) { if (ieee->handle_beacon != NULL) - ieee->handle_beacon(dev, beacon, &network); + ieee->handle_beacon(dev, beacon, target); } else { if (ieee->handle_probe_response != NULL) - ieee->handle_probe_response(dev, beacon, &network); + ieee->handle_probe_response(dev, beacon, target); } } |