diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-07 16:41:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-07 16:41:03 -0700 |
| commit | 005c93b5d876edf670b4c71d8dd79dc4e845a099 (patch) | |
| tree | 5ee50d6174e3ed9f4fec8fec9ca53e780b874a23 /net/mac80211/mesh.c | |
| parent | fb9e2d887243499b8d28efcf80821c4f6a092395 (diff) | |
| parent | 1144601118507f8b3b676a9a392584d216d3f2cc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/mesh.c')
| -rw-r--r-- | net/mac80211/mesh.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 61080c5fad5..7a6bebce7f2 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -749,9 +749,6 @@ ieee80211_mesh_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb) switch (fc & IEEE80211_FCTL_STYPE) { case IEEE80211_STYPE_ACTION: - if (skb->len < IEEE80211_MIN_ACTION_SIZE) - return RX_DROP_MONITOR; - /* fall through */ case IEEE80211_STYPE_PROBE_RESP: case IEEE80211_STYPE_BEACON: skb_queue_tail(&ifmsh->skb_queue, skb); |