Johannes Berg wrote:
> -ieee80211_rx_result
> -ieee80211_mesh_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb)
> -{
> - struct ieee80211_local *local = sdata->local;
> - struct ieee80211_mgmt *mgmt;
> - u16 fc;
> -
> - if (skb->len < 24)
> - return RX_DROP_MONITOR;
> -
> - mgmt = (struct ieee80211_mgmt *) skb->data;
> - fc = le16_to_cpu(mgmt->frame_control);
> -
> - switch (fc & IEEE80211_FCTL_STYPE) {
> - case IEEE80211_STYPE_ACTION:
> - case IEEE80211_STYPE_PROBE_RESP:
> - case IEEE80211_STYPE_BEACON:
> - skb_queue_tail(&sdata->skb_queue, skb);
> - ieee80211_queue_work(&local->hw, &sdata->work);
> - return RX_QUEUED;
> - }
> -
> - return RX_CONTINUE;
Am not familiar with mesh code, but this changes the semantics, no ?
> - if (ieee80211_vif_is_mesh(&sdata->vif))
> - return ieee80211_mesh_rx_mgmt(sdata, rx->skb);
> + stype = mgmt->frame_control & cpu_to_le16(IEEE80211_FCTL_STYPE);
> +
> + if (!ieee80211_vif_is_mesh(&sdata->vif) &&
> + sdata->vif.type != NL80211_IFTYPE_ADHOC &&
> + sdata->vif.type != NL80211_IFTYPE_STATION)
> + return RX_DROP_MONITOR;
>
> - if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
> - return ieee80211_ibss_rx_mgmt(sdata, rx->skb);
> + switch (stype) {
> + case cpu_to_le16(IEEE80211_STYPE_BEACON):
> + case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
> + /* process for all: mesh, mlme, ibss */
> + break;
> + case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
> + case cpu_to_le16(IEEE80211_STYPE_DISASSOC):
> + /* process only for station */
> + if (sdata->vif.type != NL80211_IFTYPE_STATION)
> + return RX_DROP_MONITOR;
> + break;
> + case cpu_to_le16(IEEE80211_STYPE_PROBE_REQ):
> + case cpu_to_le16(IEEE80211_STYPE_AUTH):
> + /* process only for ibss */
> + if (sdata->vif.type != NL80211_IFTYPE_ADHOC)
> + return RX_DROP_MONITOR;
> + break;
> + default:
> + return RX_DROP_MONITOR;
> + }
>
> - if (sdata->vif.type == NL80211_IFTYPE_STATION)
> - return ieee80211_sta_rx_mgmt(sdata, rx->skb);
> + /* queue up frame and kick off work to process it */
> + skb_queue_tail(&sdata->skb_queue, rx->skb);
> + ieee80211_queue_work(&rx->local->hw, &sdata->work);
>
> - return RX_DROP_MONITOR;
> + return RX_QUEUED;
> }
RX_QUEUED is the default return status for IBSS/Managed but mesh originally used RX_CONTINUE.
Wouldn't this change mesh mode's existing behavior ?
Sujith
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
