Merge upstream ieee80211.h with us (us == branch 'ieee80211' of netdev-2.6)
authorJeff Garzik <jgarzik@pretzel.yyz.us>
Tue, 28 Jun 2005 02:03:52 +0000 (22:03 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 28 Jun 2005 02:03:52 +0000 (22:03 -0400)
1  2 
drivers/net/wireless/orinoco.c
drivers/usb/net/zd1201.c

index a57187391f81c5959332b254c56df4a77923f272,aabcdc2be05ea925fee9d685bbc4d38bcd8c5e0f..4d0b5a336bd754147582e20dcf4ccba00ab5a2cf
  #include <linux/netdevice.h>
  #include <linux/if_arp.h>
  #include <linux/etherdevice.h>
+ #include <linux/ethtool.h>
  #include <linux/wireless.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>
@@@ -512,8 -145,12 +146,12 @@@ MODULE_PARM_DESC(force_monitor, "Allow 
  /* Internal constants                                               */
  /********************************************************************/
  
+ /* 802.2 LLC/SNAP header used for Ethernet encapsulation over 802.11 */
+ static const u8 encaps_hdr[] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00};
+ #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
@@@ -1107,10 -916,9 +917,9 @@@ static void __orinoco_ev_rx(struct net_
                /* At least on Symbol firmware with PCF we get quite a
                     lot of these legitimately - Poll frames with no
                     data. */
-               stats->rx_dropped++;
-               goto drop;
+               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++;
Simple merge