diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-03-15 17:02:08 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-03-15 17:02:08 -0500 |
| commit | dd288e7d75b9041f79fecae77d61cfa345da7266 (patch) | |
| tree | 85ff1d1ea0fe1d6eae0b6819422d5c6c05f862cd /net/ieee80211/ieee80211_rx.c | |
| parent | 30dcbf29cc6d92d70fa262e79e84011fe6913bed (diff) | |
| parent | 72df16f109b73be37977a26d342e9103e8851cb6 (diff) | |
Merge branch 'upstream-fixes'
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 6b8469da29b1..785d5a170a7f 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c | |||
| @@ -1515,10 +1515,10 @@ static void ieee80211_process_probe_response(struct ieee80211_device | |||
| 1515 | 1515 | ||
| 1516 | if (is_beacon(beacon->header.frame_ctl)) { | 1516 | if (is_beacon(beacon->header.frame_ctl)) { |
| 1517 | if (ieee->handle_beacon != NULL) | 1517 | if (ieee->handle_beacon != NULL) |
| 1518 | ieee->handle_beacon(dev, beacon, &network); | 1518 | ieee->handle_beacon(dev, beacon, target); |
| 1519 | } else { | 1519 | } else { |
| 1520 | if (ieee->handle_probe_response != NULL) | 1520 | if (ieee->handle_probe_response != NULL) |
| 1521 | ieee->handle_probe_response(dev, beacon, &network); | 1521 | ieee->handle_probe_response(dev, beacon, target); |
| 1522 | } | 1522 | } |
| 1523 | } | 1523 | } |
| 1524 | 1524 | ||