aboutsummaryrefslogtreecommitdiffstats
path: root/net/ieee80211/ieee80211_rx.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-03-20 11:58:09 -0500
committerSteve French <sfrench@us.ibm.com>2006-03-20 11:58:09 -0500
commitfd4a0b92db6a57cba8d03efbe1cebf91f9124ce0 (patch)
tree5886a08bfa1132058b06074f4666a36dc5ddd2a1 /net/ieee80211/ieee80211_rx.c
parent88274815f7477dc7550439413ab87c5ce4c5a623 (diff)
parent7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff)
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'net/ieee80211/ieee80211_rx.c')
-rw-r--r--net/ieee80211/ieee80211_rx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index b410ab8bcf7a..7ac6a7165d9c 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
1417 1417
1418 if (is_beacon(beacon->header.frame_ctl)) { 1418 if (is_beacon(beacon->header.frame_ctl)) {
1419 if (ieee->handle_beacon != NULL) 1419 if (ieee->handle_beacon != NULL)
1420 ieee->handle_beacon(dev, beacon, &network); 1420 ieee->handle_beacon(dev, beacon, target);
1421 } else { 1421 } else {
1422 if (ieee->handle_probe_response != NULL) 1422 if (ieee->handle_probe_response != NULL)
1423 ieee->handle_probe_response(dev, beacon, &network); 1423 ieee->handle_probe_response(dev, beacon, target);
1424 } 1424 }
1425} 1425}
1426 1426