From: Jeff Garzik <jgarzik@pobox.com>
Date: Fri, 11 Nov 2005 13:14:56 +0000 (-0500)
Subject: Merge branch 'atmel'
X-Git-Tag: v2.6.15-rc1~10^2~15
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=2ecc26b87a2b3e8650d3c7fe3fc85a8c73d5560d;p=linux-2.6-omap-h63xx.git

Merge branch 'atmel'
---

2ecc26b87a2b3e8650d3c7fe3fc85a8c73d5560d
diff --cc drivers/net/wireless/atmel.c
index a3e23527fe7,dbc991a5afc..5e53c5258a3
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@@ -1653,11 -1654,9 +1654,8 @@@ void stop_atmel_card(struct net_device 
  	unregister_netdev(dev);
  	remove_proc_entry("driver/atmel", NULL);
  	free_irq(dev->irq, dev);
 -	if (priv->firmware)
 -		kfree(priv->firmware);
 +	kfree(priv->firmware);
- 	if (freeres) {
- 		/* PCMCIA frees this stuff, so only for PCI */
- 	        release_region(dev->base_addr, 64);
-         }
+ 	release_region(dev->base_addr, 32);
  	free_netdev(dev);
  }
  
@@@ -2645,10 -2646,10 +2644,10 @@@ static void handle_beacon_probe(struct 
  	} 
  }
  
-  
- static void send_authentication_request(struct atmel_private *priv, u8 *challenge, int challenge_len)
+ 
+ static void send_authentication_request(struct atmel_private *priv, u16 system, u8 *challenge, int challenge_len)
  {
 -	struct ieee80211_hdr header;
 +	struct ieee80211_hdr_4addr header;
  	struct auth_body auth;
  	
  	header.frame_ctl = cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH);