[PATCH] Warning fix for 2.4 + pcmcia-cs + versioning

Pavel Roskin proski at gnu.org
Mon Jan 26 01:38:53 EST 2004


Hello!

If I compile CVS HostAP on Linux 2.4.25-pre7 with symbol versioning and
PCMCIA drivers from pcmcia-cs I get multiple warnings about redefined
symbols.

The attached patch fixes the warnings.  I also confirm that CVS HostAP
works in this configuration, with or without this patch.

-- 
Regards,
Pavel Roskin
-------------- next part --------------
--- driver/modules/hostap_compat.h
+++ driver/modules/hostap_compat.h
@@ -77,54 +77,71 @@
 
 
 #ifdef __IN_PCMCIA_PACKAGE__
+#undef pcmcia_access_configuration_register
 #define pcmcia_access_configuration_register(handle, reg) \
 	CardServices(AccessConfigurationRegister, handle, reg)
 
+#undef pcmcia_register_client
 #define pcmcia_register_client(handle, reg) \
 	CardServices(RegisterClient, handle, reg)
 
+#undef pcmcia_deregister_client
 #define pcmcia_deregister_client(handle) \
 	CardServices(DeregisterClient, handle)
 
+#undef pcmcia_get_first_tuple
 #define pcmcia_get_first_tuple(handle, tuple) \
 	CardServices(GetFirstTuple, handle, tuple)
 
+#undef pcmcia_get_next_tuple
 #define pcmcia_get_next_tuple(handle, tuple) \
 	CardServices(GetNextTuple, handle, tuple)
 
+#undef pcmcia_get_tuple_data
 #define pcmcia_get_tuple_data(handle, tuple) \
 	CardServices(GetTupleData, handle, tuple)
 
+#undef pcmcia_parse_tuple
 #define pcmcia_parse_tuple(handle, tuple, parse) \
 	CardServices(ParseTuple, handle, tuple, parse)
 
+#undef pcmcia_get_configuration_info
 #define pcmcia_get_configuration_info(handle, config) \
 	CardServices(GetConfigurationInfo, handle, config)
 
+#undef pcmcia_request_io
 #define pcmcia_request_io(handle, req) \
 	CardServices(RequestIO, handle, req)
 
+#undef pcmcia_request_irq
 #define pcmcia_request_irq(handle, req) \
 	CardServices(RequestIRQ, handle, req)
 
+#undef pcmcia_request_configuration
 #define pcmcia_request_configuration(handle, req) \
 	CardServices(RequestConfiguration, handle, req)
 
+#undef pcmcia_release_configuration
 #define pcmcia_release_configuration(handle) \
 	CardServices(ReleaseConfiguration, handle)
 
+#undef pcmcia_release_io
 #define pcmcia_release_io(handle, req) \
 	CardServices(ReleaseIO, handle, req)
 
+#undef pcmcia_release_irq
 #define pcmcia_release_irq(handle, req) \
 	CardServices(ReleaseIRQ, handle, req)
 
+#undef pcmcia_release_window
 #define pcmcia_release_window(win) \
 	CardServices(ReleaseWindow, win)
 
+#undef pcmcia_get_card_services_info
 #define pcmcia_get_card_services_info(info) \
 	CardServices(GetCardServicesInfo, info)
 
+#undef pcmcia_report_error
 #define pcmcia_report_error(handle, err) \
 	CardServices(ReportError, handle, err)
 #endif /* __IN_PCMCIA_PACKAGE__ */


More information about the HostAP mailing list