diff options
Diffstat (limited to 'net/irda/irnet/irnet_irda.c')
-rw-r--r-- | net/irda/irnet/irnet_irda.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/net/irda/irnet/irnet_irda.c b/net/irda/irnet/irnet_irda.c index f65c7a83bc5c..c378e668af0c 100644 --- a/net/irda/irnet/irnet_irda.c +++ b/net/irda/irnet/irnet_irda.c | |||
@@ -118,7 +118,7 @@ irnet_open_tsap(irnet_socket * self) | |||
118 | 118 | ||
119 | /* Open an IrTTP instance */ | 119 | /* Open an IrTTP instance */ |
120 | self->tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT, | 120 | self->tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT, |
121 | ¬ify); | 121 | ¬ify); |
122 | DABORT(self->tsap == NULL, -ENOMEM, | 122 | DABORT(self->tsap == NULL, -ENOMEM, |
123 | IRDA_SR_ERROR, "Unable to allocate TSAP !\n"); | 123 | IRDA_SR_ERROR, "Unable to allocate TSAP !\n"); |
124 | 124 | ||
@@ -188,7 +188,7 @@ irnet_ias_to_tsap(irnet_socket * self, | |||
188 | if(value->t.integer != -1) | 188 | if(value->t.integer != -1) |
189 | /* Get the remote TSAP selector */ | 189 | /* Get the remote TSAP selector */ |
190 | dtsap_sel = value->t.integer; | 190 | dtsap_sel = value->t.integer; |
191 | else | 191 | else |
192 | self->errno = -EADDRNOTAVAIL; | 192 | self->errno = -EADDRNOTAVAIL; |
193 | break; | 193 | break; |
194 | default: | 194 | default: |
@@ -280,8 +280,8 @@ irnet_connect_tsap(irnet_socket * self) | |||
280 | } | 280 | } |
281 | 281 | ||
282 | /* Connect to remote device */ | 282 | /* Connect to remote device */ |
283 | err = irttp_connect_request(self->tsap, self->dtsap_sel, | 283 | err = irttp_connect_request(self->tsap, self->dtsap_sel, |
284 | self->rsaddr, self->daddr, NULL, | 284 | self->rsaddr, self->daddr, NULL, |
285 | self->max_sdu_size_rx, NULL); | 285 | self->max_sdu_size_rx, NULL); |
286 | if(err != 0) | 286 | if(err != 0) |
287 | { | 287 | { |
@@ -438,7 +438,7 @@ irnet_dname_to_daddr(irnet_socket * self) | |||
438 | if(discoveries == NULL) | 438 | if(discoveries == NULL) |
439 | DRETURN(-ENETUNREACH, IRDA_SR_INFO, "Cachelog empty...\n"); | 439 | DRETURN(-ENETUNREACH, IRDA_SR_INFO, "Cachelog empty...\n"); |
440 | 440 | ||
441 | /* | 441 | /* |
442 | * Now, check all discovered devices (if any), and connect | 442 | * Now, check all discovered devices (if any), and connect |
443 | * client only about the services that the client is | 443 | * client only about the services that the client is |
444 | * interested in... | 444 | * interested in... |
@@ -627,7 +627,7 @@ irda_irnet_destroy(irnet_socket * self) | |||
627 | 627 | ||
628 | /* Unregister with LM-IAS */ | 628 | /* Unregister with LM-IAS */ |
629 | if(self->iriap) | 629 | if(self->iriap) |
630 | { | 630 | { |
631 | iriap_close(self->iriap); | 631 | iriap_close(self->iriap); |
632 | self->iriap = NULL; | 632 | self->iriap = NULL; |
633 | } | 633 | } |
@@ -945,7 +945,7 @@ irnet_setup_server(void) | |||
945 | 945 | ||
946 | /* Register with LM-IAS (so that people can connect to us) */ | 946 | /* Register with LM-IAS (so that people can connect to us) */ |
947 | irnet_server.ias_obj = irias_new_object(IRNET_SERVICE_NAME, jiffies); | 947 | irnet_server.ias_obj = irias_new_object(IRNET_SERVICE_NAME, jiffies); |
948 | irias_add_integer_attrib(irnet_server.ias_obj, IRNET_IAS_VALUE, | 948 | irias_add_integer_attrib(irnet_server.ias_obj, IRNET_IAS_VALUE, |
949 | irnet_server.s.stsap_sel, IAS_KERNEL_ATTR); | 949 | irnet_server.s.stsap_sel, IAS_KERNEL_ATTR); |
950 | irias_insert_object(irnet_server.ias_obj); | 950 | irias_insert_object(irnet_server.ias_obj); |
951 | 951 | ||
@@ -1076,7 +1076,7 @@ irnet_data_indication(void * instance, | |||
1076 | */ | 1076 | */ |
1077 | static void | 1077 | static void |
1078 | irnet_disconnect_indication(void * instance, | 1078 | irnet_disconnect_indication(void * instance, |
1079 | void * sap, | 1079 | void * sap, |
1080 | LM_REASON reason, | 1080 | LM_REASON reason, |
1081 | struct sk_buff *skb) | 1081 | struct sk_buff *skb) |
1082 | { | 1082 | { |
@@ -1166,10 +1166,10 @@ irnet_disconnect_indication(void * instance, | |||
1166 | */ | 1166 | */ |
1167 | static void | 1167 | static void |
1168 | irnet_connect_confirm(void * instance, | 1168 | irnet_connect_confirm(void * instance, |
1169 | void * sap, | 1169 | void * sap, |
1170 | struct qos_info *qos, | 1170 | struct qos_info *qos, |
1171 | __u32 max_sdu_size, | 1171 | __u32 max_sdu_size, |
1172 | __u8 max_header_size, | 1172 | __u8 max_header_size, |
1173 | struct sk_buff *skb) | 1173 | struct sk_buff *skb) |
1174 | { | 1174 | { |
1175 | irnet_socket * self = (irnet_socket *) instance; | 1175 | irnet_socket * self = (irnet_socket *) instance; |
@@ -1235,7 +1235,7 @@ irnet_connect_confirm(void * instance, | |||
1235 | static void | 1235 | static void |
1236 | irnet_flow_indication(void * instance, | 1236 | irnet_flow_indication(void * instance, |
1237 | void * sap, | 1237 | void * sap, |
1238 | LOCAL_FLOW flow) | 1238 | LOCAL_FLOW flow) |
1239 | { | 1239 | { |
1240 | irnet_socket * self = (irnet_socket *) instance; | 1240 | irnet_socket * self = (irnet_socket *) instance; |
1241 | LOCAL_FLOW oldflow = self->tx_flow; | 1241 | LOCAL_FLOW oldflow = self->tx_flow; |
@@ -1308,13 +1308,13 @@ irnet_status_indication(void * instance, | |||
1308 | * Some other node is attempting to connect to the IrNET service, and has | 1308 | * Some other node is attempting to connect to the IrNET service, and has |
1309 | * sent a connection request on our server socket. | 1309 | * sent a connection request on our server socket. |
1310 | * We just redirect the connection to the relevant IrNET socket. | 1310 | * We just redirect the connection to the relevant IrNET socket. |
1311 | * | 1311 | * |
1312 | * Note : we also make sure that between 2 irnet nodes, there can | 1312 | * Note : we also make sure that between 2 irnet nodes, there can |
1313 | * exist only one irnet connection. | 1313 | * exist only one irnet connection. |
1314 | */ | 1314 | */ |
1315 | static void | 1315 | static void |
1316 | irnet_connect_indication(void * instance, | 1316 | irnet_connect_indication(void * instance, |
1317 | void * sap, | 1317 | void * sap, |
1318 | struct qos_info *qos, | 1318 | struct qos_info *qos, |
1319 | __u32 max_sdu_size, | 1319 | __u32 max_sdu_size, |
1320 | __u8 max_header_size, | 1320 | __u8 max_header_size, |
@@ -1463,7 +1463,7 @@ irnet_connect_indication(void * instance, | |||
1463 | */ | 1463 | */ |
1464 | static void | 1464 | static void |
1465 | irnet_getvalue_confirm(int result, | 1465 | irnet_getvalue_confirm(int result, |
1466 | __u16 obj_id, | 1466 | __u16 obj_id, |
1467 | struct ias_value *value, | 1467 | struct ias_value *value, |
1468 | void * priv) | 1468 | void * priv) |
1469 | { | 1469 | { |
@@ -1526,7 +1526,7 @@ irnet_getvalue_confirm(int result, | |||
1526 | */ | 1526 | */ |
1527 | static void | 1527 | static void |
1528 | irnet_discovervalue_confirm(int result, | 1528 | irnet_discovervalue_confirm(int result, |
1529 | __u16 obj_id, | 1529 | __u16 obj_id, |
1530 | struct ias_value *value, | 1530 | struct ias_value *value, |
1531 | void * priv) | 1531 | void * priv) |
1532 | { | 1532 | { |
@@ -1645,7 +1645,7 @@ irnet_discovery_indication(discinfo_t * discovery, | |||
1645 | void * priv) | 1645 | void * priv) |
1646 | { | 1646 | { |
1647 | irnet_socket * self = &irnet_server.s; | 1647 | irnet_socket * self = &irnet_server.s; |
1648 | 1648 | ||
1649 | DENTER(IRDA_OCB_TRACE, "(self=0x%p)\n", self); | 1649 | DENTER(IRDA_OCB_TRACE, "(self=0x%p)\n", self); |
1650 | DASSERT(priv == &irnet_server, , IRDA_OCB_ERROR, | 1650 | DASSERT(priv == &irnet_server, , IRDA_OCB_ERROR, |
1651 | "Invalid instance (0x%p) !!!\n", priv); | 1651 | "Invalid instance (0x%p) !!!\n", priv); |
@@ -1676,7 +1676,7 @@ irnet_expiry_indication(discinfo_t * expiry, | |||
1676 | void * priv) | 1676 | void * priv) |
1677 | { | 1677 | { |
1678 | irnet_socket * self = &irnet_server.s; | 1678 | irnet_socket * self = &irnet_server.s; |
1679 | 1679 | ||
1680 | DENTER(IRDA_OCB_TRACE, "(self=0x%p)\n", self); | 1680 | DENTER(IRDA_OCB_TRACE, "(self=0x%p)\n", self); |
1681 | DASSERT(priv == &irnet_server, , IRDA_OCB_ERROR, | 1681 | DASSERT(priv == &irnet_server, , IRDA_OCB_ERROR, |
1682 | "Invalid instance (0x%p) !!!\n", priv); | 1682 | "Invalid instance (0x%p) !!!\n", priv); |
@@ -1718,7 +1718,7 @@ irnet_proc_read(char * buf, | |||
1718 | int i = 0; | 1718 | int i = 0; |
1719 | 1719 | ||
1720 | len = 0; | 1720 | len = 0; |
1721 | 1721 | ||
1722 | /* Get the IrNET server information... */ | 1722 | /* Get the IrNET server information... */ |
1723 | len += sprintf(buf+len, "IrNET server - "); | 1723 | len += sprintf(buf+len, "IrNET server - "); |
1724 | len += sprintf(buf+len, "IrDA state: %s, ", | 1724 | len += sprintf(buf+len, "IrDA state: %s, ", |
@@ -1811,7 +1811,7 @@ irda_irnet_init(void) | |||
1811 | memset(&irnet_server, 0, sizeof(struct irnet_root)); | 1811 | memset(&irnet_server, 0, sizeof(struct irnet_root)); |
1812 | 1812 | ||
1813 | /* Setup start of irnet instance list */ | 1813 | /* Setup start of irnet instance list */ |
1814 | irnet_server.list = hashbin_new(HB_NOLOCK); | 1814 | irnet_server.list = hashbin_new(HB_NOLOCK); |
1815 | DABORT(irnet_server.list == NULL, -ENOMEM, | 1815 | DABORT(irnet_server.list == NULL, -ENOMEM, |
1816 | MODULE_ERROR, "Can't allocate hashbin!\n"); | 1816 | MODULE_ERROR, "Can't allocate hashbin!\n"); |
1817 | /* Init spinlock for instance list */ | 1817 | /* Init spinlock for instance list */ |