* net-next-2.6 wireless build failure @ 2011-05-18 19:55 David Miller 2011-05-18 20:38 ` Luciano Coelho 0 siblings, 1 reply; 4+ messages in thread From: David Miller @ 2011-05-18 19:55 UTC (permalink / raw) To: linux-wireless; +Cc: netdev DQpUaGUgc3VzcGVuZCBvcCBtZW1iZXIgb2YgaWVlZTgwMjExX29wcyBpcyBvbmx5IGF2YWlsYWJs ZSB3aGVuDQpDT05GSUdfUE0gaXMgZW5hYmxlZC4NCg0KZHJpdmVycy9uZXQvd2lyZWxlc3Mvd2wx Mnh4L21haW4uYzozNjUzOjI6IGVycm9yOiB1bmtub3duIGZpZWxkIKFzdXNwZW5koiBzcGVjaWZp ZWQgaW4gaW5pdGlhbGl6ZXINCmRyaXZlcnMvbmV0L3dpcmVsZXNzL3dsMTJ4eC9tYWluLmM6MzY1 MzoyOiB3YXJuaW5nOiBpbml0aWFsaXphdGlvbiBmcm9tIGluY29tcGF0aWJsZSBwb2ludGVyIHR5 cGUgW2VuYWJsZWQgYnkgZGVmYXVsdF0NCmRyaXZlcnMvbmV0L3dpcmVsZXNzL3dsMTJ4eC9tYWlu LmM6MzY1MzoyOiB3YXJuaW5nOiAobmVhciBpbml0aWFsaXphdGlvbiBmb3IgoXdsMTI3MV9vcHMu Y29uZmlnoikgW2VuYWJsZWQgYnkgZGVmYXVsdF0NCmRyaXZlcnMvbmV0L3dpcmVsZXNzL3dsMTJ4 eC9tYWluLmM6MzY1NDoyOiBlcnJvcjogdW5rbm93biBmaWVsZCChcmVzdW1loiBzcGVjaWZpZWQg aW4gaW5pdGlhbGl6ZXINCmRyaXZlcnMvbmV0L3dpcmVsZXNzL3dsMTJ4eC9tYWluLmM6MzY1NDoy OiB3YXJuaW5nOiBpbml0aWFsaXphdGlvbiBmcm9tIGluY29tcGF0aWJsZSBwb2ludGVyIHR5cGUg W2VuYWJsZWQgYnkgZGVmYXVsdF0NCmRyaXZlcnMvbmV0L3dpcmVsZXNzL3dsMTJ4eC9tYWluLmM6 MzY1NDoyOiB3YXJuaW5nOiAobmVhciBpbml0aWFsaXphdGlvbiBmb3IgoXdsMTI3MV9vcHMuYnNz X2luZm9fY2hhbmdlZKIpIFtlbmFibGVkIGJ5IGRlZmF1bHRdDQoNClNvbWVvbmUgcGxlYXNlIGZp eCB0aGlzLg0K ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: net-next-2.6 wireless build failure 2011-05-18 19:55 net-next-2.6 wireless build failure David Miller @ 2011-05-18 20:38 ` Luciano Coelho 2011-05-18 20:45 ` [PATCH] wl12xx: fix compilation error when CONFIG_PM is not set Luciano Coelho 0 siblings, 1 reply; 4+ messages in thread From: Luciano Coelho @ 2011-05-18 20:38 UTC (permalink / raw) To: David Miller; +Cc: linux-wireless, netdev, ido, eliad Hi Dave, On Wed, 2011-05-18 at 15:55 -0400, David Miller wrote: > The suspend op member of ieee80211_ops is only available when > CONFIG_PM is enabled. > > drivers/net/wireless/wl12xx/main.c:3653:2: error: unknown field ‘suspend’ specified in initializer > drivers/net/wireless/wl12xx/main.c:3653:2: warning: initialization from incompatible pointer type [enabled by default] > drivers/net/wireless/wl12xx/main.c:3653:2: warning: (near initialization for ‘wl1271_ops.config’) [enabled by default] > drivers/net/wireless/wl12xx/main.c:3654:2: error: unknown field ‘resume’ specified in initializer > drivers/net/wireless/wl12xx/main.c:3654:2: warning: initialization from incompatible pointer type [enabled by default] > drivers/net/wireless/wl12xx/main.c:3654:2: warning: (near initialization for ‘wl1271_ops.bss_info_changed’) [enabled by default] > > Someone please fix this. I'm really sorry to let this pass through. I'll send a patch to fix it in a second. -- Cheers, Luca. ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] wl12xx: fix compilation error when CONFIG_PM is not set 2011-05-18 20:38 ` Luciano Coelho @ 2011-05-18 20:45 ` Luciano Coelho 2011-05-18 21:00 ` David Miller 0 siblings, 1 reply; 4+ messages in thread From: Luciano Coelho @ 2011-05-18 20:45 UTC (permalink / raw) To: linux-wireless, David Miller; +Cc: netdev, linville, eliad, ido There was a compilation error when PM is not enabled: CC [M] drivers/net/wireless/wl12xx/main.o drivers/net/wireless/wl12xx/main.c:3653: error: unknown field 'suspend' specified in initializer drivers/net/wireless/wl12xx/main.c:3653: warning: initialization from incompatible pointer type drivers/net/wireless/wl12xx/main.c:3654: error: unknown field 'resume' specified in initializer drivers/net/wireless/wl12xx/main.c:3654: warning: initialization from incompatible pointer type Fix this by adding #ifdef's in the appropriate places. Cc: Eliad Peller <eliad@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com> --- drivers/net/wireless/wl12xx/main.c | 4 ++++ drivers/net/wireless/wl12xx/sdio.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index 610be03..bc00e52 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c @@ -1350,6 +1350,7 @@ static struct notifier_block wl1271_dev_notifier = { .notifier_call = wl1271_dev_notify, }; +#ifdef CONFIG_PM static int wl1271_configure_suspend(struct wl1271 *wl) { int ret; @@ -1493,6 +1494,7 @@ static int wl1271_op_resume(struct ieee80211_hw *hw) return 0; } +#endif static int wl1271_op_start(struct ieee80211_hw *hw) { @@ -3650,8 +3652,10 @@ static const struct ieee80211_ops wl1271_ops = { .stop = wl1271_op_stop, .add_interface = wl1271_op_add_interface, .remove_interface = wl1271_op_remove_interface, +#ifdef CONFIG_PM .suspend = wl1271_op_suspend, .resume = wl1271_op_resume, +#endif .config = wl1271_op_config, .prepare_multicast = wl1271_op_prepare_multicast, .configure_filter = wl1271_op_configure_filter, diff --git a/drivers/net/wireless/wl12xx/sdio.c b/drivers/net/wireless/wl12xx/sdio.c index 92d29a8..536e506 100644 --- a/drivers/net/wireless/wl12xx/sdio.c +++ b/drivers/net/wireless/wl12xx/sdio.c @@ -330,6 +330,7 @@ static void __devexit wl1271_remove(struct sdio_func *func) wl1271_free_hw(wl); } +#ifdef CONFIG_PM static int wl1271_suspend(struct device *dev) { /* Tell MMC/SDIO core it's OK to power down the card @@ -385,15 +386,18 @@ static const struct dev_pm_ops wl1271_sdio_pm_ops = { .suspend = wl1271_suspend, .resume = wl1271_resume, }; +#endif static struct sdio_driver wl1271_sdio_driver = { .name = "wl1271_sdio", .id_table = wl1271_devices, .probe = wl1271_probe, .remove = __devexit_p(wl1271_remove), +#ifdef CONFIG_PM .drv = { .pm = &wl1271_sdio_pm_ops, }, +#endif }; static int __init wl1271_init(void) -- 1.7.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] wl12xx: fix compilation error when CONFIG_PM is not set 2011-05-18 20:45 ` [PATCH] wl12xx: fix compilation error when CONFIG_PM is not set Luciano Coelho @ 2011-05-18 21:00 ` David Miller 0 siblings, 0 replies; 4+ messages in thread From: David Miller @ 2011-05-18 21:00 UTC (permalink / raw) To: coelho; +Cc: linux-wireless, netdev, linville, eliad, ido From: Luciano Coelho <coelho@ti.com> Date: Wed, 18 May 2011 23:45:37 +0300 > There was a compilation error when PM is not enabled: > > CC [M] drivers/net/wireless/wl12xx/main.o > drivers/net/wireless/wl12xx/main.c:3653: error: unknown field 'suspend' specified in initializer > drivers/net/wireless/wl12xx/main.c:3653: warning: initialization from incompatible pointer type > drivers/net/wireless/wl12xx/main.c:3654: error: unknown field 'resume' specified in initializer > drivers/net/wireless/wl12xx/main.c:3654: warning: initialization from incompatible pointer type > > Fix this by adding #ifdef's in the appropriate places. > > Cc: Eliad Peller <eliad@wizery.com> > Signed-off-by: Luciano Coelho <coelho@ti.com> Applied, thanks. ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-05-18 21:01 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-05-18 19:55 net-next-2.6 wireless build failure David Miller 2011-05-18 20:38 ` Luciano Coelho 2011-05-18 20:45 ` [PATCH] wl12xx: fix compilation error when CONFIG_PM is not set Luciano Coelho 2011-05-18 21:00 ` David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox