diff options
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r-- | net/mac80211/util.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 0ad534abc008..bb9664cb8831 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c | |||
@@ -1523,7 +1523,8 @@ int ieee80211_build_preq_ies(struct ieee80211_local *local, u8 *buffer, | |||
1523 | }; | 1523 | }; |
1524 | 1524 | ||
1525 | struct sk_buff *ieee80211_build_probe_req(struct ieee80211_sub_if_data *sdata, | 1525 | struct sk_buff *ieee80211_build_probe_req(struct ieee80211_sub_if_data *sdata, |
1526 | u8 *dst, u32 ratemask, | 1526 | const u8 *src, const u8 *dst, |
1527 | u32 ratemask, | ||
1527 | struct ieee80211_channel *chan, | 1528 | struct ieee80211_channel *chan, |
1528 | const u8 *ssid, size_t ssid_len, | 1529 | const u8 *ssid, size_t ssid_len, |
1529 | const u8 *ie, size_t ie_len, | 1530 | const u8 *ie, size_t ie_len, |
@@ -1548,8 +1549,8 @@ struct sk_buff *ieee80211_build_probe_req(struct ieee80211_sub_if_data *sdata, | |||
1548 | else | 1549 | else |
1549 | chandef.chan = chan; | 1550 | chandef.chan = chan; |
1550 | 1551 | ||
1551 | skb = ieee80211_probereq_get(&local->hw, &sdata->vif, | 1552 | skb = ieee80211_probereq_get(&local->hw, src, ssid, ssid_len, |
1552 | ssid, ssid_len, 100 + ie_len); | 1553 | 100 + ie_len); |
1553 | if (!skb) | 1554 | if (!skb) |
1554 | return NULL; | 1555 | return NULL; |
1555 | 1556 | ||
@@ -1571,7 +1572,8 @@ struct sk_buff *ieee80211_build_probe_req(struct ieee80211_sub_if_data *sdata, | |||
1571 | return skb; | 1572 | return skb; |
1572 | } | 1573 | } |
1573 | 1574 | ||
1574 | void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst, | 1575 | void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, |
1576 | const u8 *src, const u8 *dst, | ||
1575 | const u8 *ssid, size_t ssid_len, | 1577 | const u8 *ssid, size_t ssid_len, |
1576 | const u8 *ie, size_t ie_len, | 1578 | const u8 *ie, size_t ie_len, |
1577 | u32 ratemask, bool directed, u32 tx_flags, | 1579 | u32 ratemask, bool directed, u32 tx_flags, |
@@ -1579,7 +1581,7 @@ void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst, | |||
1579 | { | 1581 | { |
1580 | struct sk_buff *skb; | 1582 | struct sk_buff *skb; |
1581 | 1583 | ||
1582 | skb = ieee80211_build_probe_req(sdata, dst, ratemask, channel, | 1584 | skb = ieee80211_build_probe_req(sdata, src, dst, ratemask, channel, |
1583 | ssid, ssid_len, | 1585 | ssid, ssid_len, |
1584 | ie, ie_len, directed); | 1586 | ie, ie_len, directed); |
1585 | if (skb) { | 1587 | if (skb) { |