/spare/repo/netdev-2.6 branch 'master'

[linux-2.6.git] / drivers / net / wireless / orinoco.c

diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index 9c2d07cde0101a311c298bedba42d318861a9d34..d7947358e49db7bd55a59058fd0ca88ac65091ce 100644 (file)
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -94,6 +94,8 @@
 #include <net/iw_handler.h>
 #include <net/ieee80211.h>
 
 #include <net/iw_handler.h>
 #include <net/ieee80211.h>
 

+#include <net/ieee80211.h>
+

 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/system.h>


@@ -101,7 +103,6 @@
 #include "hermes.h"
 #include "hermes_rid.h"
 #include "orinoco.h"
 #include "hermes.h"
 #include "hermes_rid.h"
 #include "orinoco.h"

-#include "ieee802_11.h"

 
 /********************************************************************/
 /* Module information                                               */
 
 /********************************************************************/
 /* Module information                                               */


@@ -150,7 +151,7 @@ static const u8 encaps_hdr[] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00};
 #define ENCAPS_OVERHEAD                (sizeof(encaps_hdr) + 2)
 
 #define ORINOCO_MIN_MTU                256
 #define ENCAPS_OVERHEAD                (sizeof(encaps_hdr) + 2)
 
 #define ORINOCO_MIN_MTU                256

-#define ORINOCO_MAX_MTU                (IEEE802_11_DATA_LEN - ENCAPS_OVERHEAD)
+#define ORINOCO_MAX_MTU                (IEEE80211_DATA_LEN - ENCAPS_OVERHEAD)

 
 #define SYMBOL_MAX_VER_LEN     (14)
 #define USER_BAP               0
 
 #define SYMBOL_MAX_VER_LEN     (14)
 #define USER_BAP               0


@@ -442,7 +443,7 @@ static int orinoco_change_mtu(struct net_device *dev, int new_mtu)
        if ( (new_mtu < ORINOCO_MIN_MTU) || (new_mtu > ORINOCO_MAX_MTU) )
                return -EINVAL;
 
        if ( (new_mtu < ORINOCO_MIN_MTU) || (new_mtu > ORINOCO_MAX_MTU) )
                return -EINVAL;
 

-       if ( (new_mtu + ENCAPS_OVERHEAD + IEEE802_11_HLEN) >
+       if ( (new_mtu + ENCAPS_OVERHEAD + IEEE80211_HLEN) >

             (priv->nicbuf_size - ETH_HLEN) )
                return -EINVAL;
 
             (priv->nicbuf_size - ETH_HLEN) )
                return -EINVAL;
 


@@ -918,7 +919,7 @@ static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw)
                    data. */
                return;
        }
                    data. */
                return;
        }

-       if (length > IEEE802_11_DATA_LEN) {
+       if (length > IEEE80211_DATA_LEN) {

                printk(KERN_WARNING "%s: Oversized frame received (%d bytes)\n",
                       dev->name, length);
                stats->rx_length_errors++;
                printk(KERN_WARNING "%s: Oversized frame received (%d bytes)\n",
                       dev->name, length);
                stats->rx_length_errors++;


@@ -2272,7 +2273,7 @@ static int orinoco_init(struct net_device *dev)
 
        /* No need to lock, the hw_unavailable flag is already set in
         * alloc_orinocodev() */
 
        /* No need to lock, the hw_unavailable flag is already set in
         * alloc_orinocodev() */

-       priv->nicbuf_size = IEEE802_11_FRAME_LEN + ETH_HLEN;
+       priv->nicbuf_size = IEEE80211_FRAME_LEN + ETH_HLEN;

 
        /* Initialize the firmware */
        err = orinoco_reinit_firmware(dev);
 
        /* Initialize the firmware */
        err = orinoco_reinit_firmware(dev);