(6/14) irlmp exports and inline
PATCH 1/1 (6/14) irlmp exports and inline
ir264_irsyms_06_irlmp.diff :
~~~~~~~~~~~~~~~~~~~~~~~~~~
<Patch from Stephen Hemminger>
(6/14) irlmp exports and inline
Move irlmp routines out irsyms.
Make get_saddr and get_daddr inline
Rename lmp_reasons to irlmp_reasons
include/net/irda/irlmp.h renamed from include/net/irda.s5/irlmp.h +10 -3
@@ -249,10 +249,17 @@ int irlmp_slsap_inuse(__u8 slsap);__u8 irlmp_find_free_slsap (void );LM_REASON irlmp_convert_lap_reason (LAP_REASON ); -__u32 irlmp_get_saddr (struct lsap_cb *self); -__u32 irlmp_get_daddr (struct lsap_cb *self); +static inline __u32 irlmp_get_saddr (const struct lsap_cb *self) +{ +return (self && !self->lap) ? self->lap->saddr :0 ; +} -extern char *lmp_reasons[]; +static inline __u32 irlmp_get_daddr (const struct lsap_cb *self) +{ +return (self && self->lap) ? self->lap->daddr :0 ; +} + +extern const char *irlmp_reasons[];extern int sysctl_discovery_timeout;extern int sysctl_discovery_slots;extern int sysctl_discovery;
net/irda/iriap.c renamed from net/irda.s5/iriap.c +1 -3
@@ -62,8 +62,6 @@ static const char *ias_charset_types[] =static hashbin_t *iriap =NULL ;static void *service_handle; -extern char *lmp_reasons[]; -static void __iriap_close (struct iriap_cb *self);static int iriap_register_lsap (struct iriap_cb *self,__u8 slsap_sel,int mode); static void iriap_disconnect_indication(void *instance, void *sap,
@@ -291,7 +289,7 @@ static void iriap_disconnect_indication( {struct iriap_cb *self; -IRDA_DEBUG (4 ,"%s(), reason=%s\n" , __FUNCTION__, lmp_reasons[reason]); +IRDA_DEBUG (4 ,"%s(), reason=%s\n" , __FUNCTION__, irlmp_reasons[reason]); self = (struct iriap_cb *) instance;
net/irda/irlmp.c renamed from net/irda.s5/irlmp.c +21 -21
172 lines not on this page · raw message
net/irda/irsyms.c renamed from net/irda.s5/irsyms.c +0 -21
@@ -79,27 +79,6 @@ EXPORT_SYMBOL(irda_param_extract_all);EXPORT_SYMBOL (irda_param_pack);EXPORT_SYMBOL (irda_param_unpack); -/* IrLMP */ -EXPORT_SYMBOL (irlmp_discovery_request); -EXPORT_SYMBOL (irlmp_get_discoveries); -EXPORT_SYMBOL (sysctl_discovery_timeout); -EXPORT_SYMBOL (irlmp_register_client); -EXPORT_SYMBOL (irlmp_unregister_client); -EXPORT_SYMBOL (irlmp_update_client); -EXPORT_SYMBOL (irlmp_register_service); -EXPORT_SYMBOL (irlmp_unregister_service); -EXPORT_SYMBOL (irlmp_service_to_hint); -EXPORT_SYMBOL (irlmp_data_request); -EXPORT_SYMBOL (irlmp_open_lsap); -EXPORT_SYMBOL (irlmp_close_lsap); -EXPORT_SYMBOL (irlmp_connect_request); -EXPORT_SYMBOL (irlmp_connect_response); -EXPORT_SYMBOL (irlmp_disconnect_request); -EXPORT_SYMBOL (irlmp_get_daddr); -EXPORT_SYMBOL (irlmp_get_saddr); -EXPORT_SYMBOL (irlmp_dup); -EXPORT_SYMBOL (lmp_reasons); -/* IrLAP */ EXPORT_SYMBOL (irlap_open);EXPORT_SYMBOL (irlap_close);