Staging: wlan-ng: p80211wext.c add latest changes & remove extra nulls from wext_handlers

[linux-2.6-omap-h63xx.git] / drivers / staging / wlan-ng / p80211conv.c

diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c
index 68121b9b34fa2460c5fec62c666a091d9cd03b02..e7cc89f8e7a8f6dec97b02f27c1ab0eb3365eaed 100644 (file)
--- a/drivers/staging/wlan-ng/p80211conv.c
+++ b/drivers/staging/wlan-ng/p80211conv.c
@@ -52,9 +52,6 @@
 /*================================================================*/
 /* System Includes */
 
-#define __NO_VERSION__         /* prevent the static definition */
-
-
 #include <linux/version.h>
 
 #include <linux/module.h>
@@ -70,7 +67,6 @@
 
 #include <asm/byteorder.h>
 
-#include "version.h"
 #include "wlan_compat.h"
 
 /*================================================================*/
@@ -100,8 +96,8 @@
 /*================================================================*/
 /* Local Static Definitions */
 
-static UINT8   oui_rfc1042[] = {0x00, 0x00, 0x00};
-static UINT8   oui_8021h[] = {0x00, 0x00, 0xf8};
+static u8      oui_rfc1042[] = {0x00, 0x00, 0x00};
+static u8      oui_8021h[] = {0x00, 0x00, 0xf8};
 
 /*================================================================*/
 /* Local Function Declarations */
@@ -135,11 +131,11 @@ static UINT8      oui_8021h[] = {0x00, 0x00, 0xf8};
 * Call context:
 *      May be called in interrupt or non-interrupt context
 ----------------------------------------------------------------*/
-int skb_ether_to_p80211( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff *skb, p80211_hdr_t *p80211_hdr, p80211_metawep_t *p80211_wep)
+int skb_ether_to_p80211( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb, p80211_hdr_t *p80211_hdr, p80211_metawep_t *p80211_wep)
 {
 
-       UINT16          fc;
-       UINT16          proto;
+       u16          fc;
+       u16          proto;
        wlan_ethhdr_t   e_hdr;
        wlan_llc_t      *e_llc;
        wlan_snap_t     *e_snap;
@@ -298,14 +294,14 @@ static void orinoco_spy_gather(wlandevice_t *wlandev, char *mac,
 * Call context:
 *      May be called in interrupt or non-interrupt context
 ----------------------------------------------------------------*/
-int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff *skb)
+int skb_p80211_to_ether( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb)
 {
        netdevice_t     *netdev = wlandev->netdev;
-       UINT16          fc;
-       UINT            payload_length;
-       UINT            payload_offset;
-       UINT8           daddr[WLAN_ETHADDR_LEN];
-       UINT8           saddr[WLAN_ETHADDR_LEN];
+       u16          fc;
+       unsigned int            payload_length;
+       unsigned int            payload_offset;
+       u8              daddr[WLAN_ETHADDR_LEN];
+       u8              saddr[WLAN_ETHADDR_LEN];
        p80211_hdr_t    *w_hdr;
        wlan_ethhdr_t   *e_hdr;
        wlan_llc_t      *e_llc;
@@ -381,14 +377,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 +396,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 +416,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);
 
@@ -473,16 +440,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);
 
@@ -528,7 +485,7 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, UINT32 ethconv, struct sk_buff *
 * Call context:
 *      May be called in interrupt or non-interrupt context
 ----------------------------------------------------------------*/
-int p80211_stt_findproto(UINT16 proto)
+int p80211_stt_findproto(u16 proto)
 {
        /* Always return found for now.  This is the behavior used by the */
        /*  Zoom Win95 driver when 802.1h mode is selected */