From: Jeff Garzik <jgarzik@pretzel.yyz.us>
Date: Tue, 28 Jun 2005 02:03:52 +0000 (-0400)
Subject: Merge upstream ieee80211.h with us (us == branch 'ieee80211' of netdev-2.6)
X-Git-Tag: v2.6.14-rc1~1017^2~44^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=716b43303df605510399d6da0d0dd4e2ea376e7c;p=linux-2.6

Merge upstream ieee80211.h with us (us == branch 'ieee80211' of netdev-2.6)
---

716b43303df605510399d6da0d0dd4e2ea376e7c
diff --cc drivers/net/wireless/orinoco.c
index a57187391f,aabcdc2be0..4d0b5a336b
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@@ -462,10 -89,11 +89,13 @@@
  #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++;