forked from Minki/linux
Staging: wlan-ng: Get rid of the MTU tests in the rx conversion path.
They are not needed. Signed-off-by: Solomon Peachy <pizza@shaftnet.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
5db8dcc98b
commit
9d86349e9c
@ -381,14 +381,6 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff *
|
||||
(memcmp(saddr, e_hdr->saddr, WLAN_ETHADDR_LEN) == 0))) {
|
||||
WLAN_LOG_DEBUG(3, "802.3 ENCAP len: %d\n", payload_length);
|
||||
/* 802.3 Encapsulated */
|
||||
/* Test for an overlength frame */
|
||||
if ( payload_length > (netdev->mtu + WLAN_ETHHDR_LEN)) {
|
||||
/* A bogus length ethfrm has been encap'd. */
|
||||
/* Is someone trying an oflow attack? */
|
||||
WLAN_LOG_ERROR("ENCAP frame too large (%d > %d)\n",
|
||||
payload_length, netdev->mtu + WLAN_ETHHDR_LEN);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Chop off the 802.11 header. it's already sane. */
|
||||
skb_pull(skb, payload_offset);
|
||||
@ -408,15 +400,6 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff *
|
||||
/* it's a SNAP + RFC1042 frame && protocol is in STT */
|
||||
/* build 802.3 + RFC1042 */
|
||||
|
||||
/* 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("SNAP frame too large (%d > %d)\n",
|
||||
payload_length, netdev->mtu);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* chop 802.11 header from skb. */
|
||||
skb_pull(skb, payload_offset);
|
||||
|
||||
@ -437,18 +420,6 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff *
|
||||
/* it's an 802.1h frame || (an RFC1042 && protocol is not in STT) */
|
||||
/* build a DIXII + RFC894 */
|
||||
|
||||
/* Test for an overlength frame */
|
||||
if ((payload_length - sizeof(wlan_llc_t) - sizeof(wlan_snap_t))
|
||||
> netdev->mtu) {
|
||||
/* A bogus length ethfrm has been sent. */
|
||||
/* Is someone trying an oflow attack? */
|
||||
WLAN_LOG_ERROR("DIXII frame too large (%ld > %d)\n",
|
||||
(long int) (payload_length - sizeof(wlan_llc_t) -
|
||||
sizeof(wlan_snap_t)),
|
||||
netdev->mtu);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* chop 802.11 header from skb. */
|
||||
skb_pull(skb, payload_offset);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user