From: Jeff Garzik <jgarzik@pretzel.yyz.us>
Date: Mon, 27 Jun 2005 03:38:58 +0000 (-0400)
Subject: Merge /spare/repo/linux-2.6/
X-Git-Tag: v2.6.14-rc1~1017^2~45^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5696c1944a33b4434a9a1ebb6383b906afd43a10;p=linux-2.6

Merge /spare/repo/linux-2.6/
---

5696c1944a33b4434a9a1ebb6383b906afd43a10
diff --cc drivers/net/wireless/orinoco.c
index b47684c321,b1078baa1d..a57187391f
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@@ -2265,10 -2278,10 +2279,10 @@@ static int orinoco_init(struct net_devi
  
  	/* 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 = hermes_init(hw);
+ 	err = orinoco_reinit_firmware(dev);
  	if (err != 0) {
  		printk(KERN_ERR "%s: failed to initialize firmware (err = %d)\n",
  		       dev->name, err);