From 209cfc262dde4c53bfd003731cafc21646eb813a Mon Sep 17 00:00:00 2001 From: Rami Rosen Date: Tue, 6 Jan 2009 10:50:51 +0200 Subject: [PATCH] --- yaml --- r: 134081 b: refs/heads/master c: 504a71e4c2718d8ef5dc5bff89dea47a91cf87e5 h: refs/heads/master i: 134079: 9e3ad0cf0d166b19a2fcd9c836fb4c5f8f0a2eb9 v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3b12cac1ef0a..7f1ade2d6e32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: def1343971b2abd158ece1a71dd1c7a20e4c2fcb +refs/heads/master: 504a71e4c2718d8ef5dc5bff89dea47a91cf87e5 diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index cac4f65d9e61..aafa112ae09c 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -1842,8 +1842,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata, struct ieee80211_if_sta *ifsta, struct ieee80211_mgmt *mgmt, - size_t len, - struct ieee80211_rx_status *rx_status) + size_t len) { struct ieee80211_local *local = sdata->local; int tx_last_beacon; @@ -1958,8 +1957,7 @@ static void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, switch (fc & IEEE80211_FCTL_STYPE) { case IEEE80211_STYPE_PROBE_REQ: - ieee80211_rx_mgmt_probe_req(sdata, ifsta, mgmt, skb->len, - rx_status); + ieee80211_rx_mgmt_probe_req(sdata, ifsta, mgmt, skb->len); break; case IEEE80211_STYPE_PROBE_RESP: ieee80211_rx_mgmt_probe_resp(sdata, mgmt, skb->len, rx_status);