* [PATCH] adm8211: Fix compilation for d80211 hwmode API change
@ 2006-12-15 19:44 Michael Buesch
2006-12-15 21:34 ` Michael Wu
0 siblings, 1 reply; 2+ messages in thread
From: Michael Buesch @ 2006-12-15 19:44 UTC (permalink / raw)
To: Jiri Benc; +Cc: John Linville, netdev, flamingice
This fixes compilation for the d80211 hwmode API change.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Index: jbenc-dscape/drivers/net/wireless/d80211/adm8211/adm8211.c
===================================================================
--- jbenc-dscape.orig/drivers/net/wireless/d80211/adm8211/adm8211.c 2006-12-15 15:58:04.000000000 +0100
+++ jbenc-dscape/drivers/net/wireless/d80211/adm8211/adm8211.c 2006-12-15 18:50:44.000000000 +0100
@@ -2034,8 +2034,6 @@ static int __devinit adm8211_probe(struc
dev->channel_change_time = 1000;
dev->maxssi = ADM8211_RX_MAX_SSI;// FIXME - This is an approximation
- dev->num_modes = 1;
- dev->modes = priv->modes;
priv->modes[0].mode = MODE_IEEE80211B;
/* channel info filled in by adm8211_read_eeprom */
memcpy(priv->rates, adm8211_rates, sizeof(adm8211_rates));
@@ -2073,12 +2071,20 @@ static int __devinit adm8211_probe(struc
printk(KERN_ERR "%s (adm8211): Cannot register hardware\n", pci_name(pdev));
goto err_free_desc;
}
+ err = ieee80211_register_hwmode(dev, &priv->modes[0]);
+ if (err) {
+ printk(KERN_ERR "%s (adm8211): Cannot register hwmode\n", pci_name(pdev));
+ goto err_unreg_hw;
+ }
printk(KERN_INFO "wiphy%d: hwaddr " MAC_FMT ", Rev 0x%02x\n",
dev->index, MAC_ARG(dev->perm_addr), priv->revid);
return 0;
+ err_unreg_hw:
+ ieee80211_unregister_hw(dev);
+
err_free_desc:
pci_free_consistent(pdev,
sizeof(struct adm8211_desc) * priv->rx_ring_size +
Index: jbenc-dscape/drivers/net/wireless/d80211/adm8211/adm8211.h
===================================================================
--- jbenc-dscape.orig/drivers/net/wireless/d80211/adm8211/adm8211.h 2006-12-15 15:58:04.000000000 +0100
+++ jbenc-dscape/drivers/net/wireless/d80211/adm8211/adm8211.h 2006-12-15 18:43:57.000000000 +0100
@@ -532,7 +532,7 @@ struct adm8211_priv {
unsigned cur_tx, dirty_tx, cur_rx;
struct ieee80211_low_level_stats stats;
- struct ieee80211_hw_modes modes[1];
+ struct ieee80211_hw_mode modes[1];
struct ieee80211_rate rates[ARRAY_SIZE(adm8211_rates)];
int mode;
--
Greetings Michael.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] adm8211: Fix compilation for d80211 hwmode API change
2006-12-15 19:44 [PATCH] adm8211: Fix compilation for d80211 hwmode API change Michael Buesch
@ 2006-12-15 21:34 ` Michael Wu
0 siblings, 0 replies; 2+ messages in thread
From: Michael Wu @ 2006-12-15 21:34 UTC (permalink / raw)
To: Michael Buesch; +Cc: Jiri Benc, John Linville, netdev
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
On Friday 15 December 2006 14:44, Michael Buesch wrote:
> This fixes compilation for the d80211 hwmode API change.
>
> Signed-off-by: Michael Buesch <mb@bu3sch.de>
>
ACK, looks good to me.
-Michael Wu
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-12-15 21:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-12-15 19:44 [PATCH] adm8211: Fix compilation for d80211 hwmode API change Michael Buesch
2006-12-15 21:34 ` Michael Wu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).