diff --git a/[refs] b/[refs] index a910b89762cf..17f845ea364d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d86349e9c8059039d41f5d40ad42d77ef5acf87 +refs/heads/master: 905862c9f98676807931c9c832ee12ba0d58bc88 diff --git a/trunk/drivers/staging/wlan-ng/p80211conv.c b/trunk/drivers/staging/wlan-ng/p80211conv.c index d58f10f11d00..aaf1c9d44487 100644 --- a/trunk/drivers/staging/wlan-ng/p80211conv.c +++ b/trunk/drivers/staging/wlan-ng/p80211conv.c @@ -444,16 +444,6 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff * /* build an 802.3 frame */ /* allocate space and setup hostbuf */ - /* Test for an overlength frame */ - if ( payload_length > netdev->mtu ) { - /* A bogus length ethfrm has been sent. */ - /* Is someone trying an oflow attack? */ - WLAN_LOG_ERROR("OTHER frame too large (%d > %d)\n", - payload_length, - netdev->mtu); - return 1; - } - /* Chop off the 802.11 header. */ skb_pull(skb, payload_offset);