summaryrefslogtreecommitdiff
path: root/net/irda/irnet
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2007-02-09 23:24:53 +0900
committerDavid S. Miller <davem@sunset.davemloft.net>2007-02-10 23:19:47 -0800
commit6819bc2e1e46c71711a8dddf4040e706b02973c0 (patch)
tree6baa6c808fd70a01d5e95c77b02d0a6c5409cc9e /net/irda/irnet
parent981c0ff6900c981668a798fe9e0bc5ba32ee3fd4 (diff)
[NET] IRDA: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda/irnet')
-rw-r--r--net/irda/irnet/irnet.h4
-rw-r--r--net/irda/irnet/irnet_irda.c38
-rw-r--r--net/irda/irnet/irnet_irda.h2
-rw-r--r--net/irda/irnet/irnet_ppp.c10
4 files changed, 27 insertions, 27 deletions
diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h
index 80887528e77e..873ae189e37a 100644
--- a/net/irda/irnet/irnet.h
+++ b/net/irda/irnet/irnet.h
@@ -44,7 +44,7 @@
* the generic Linux PPP driver. Because IrNET depend on recent
* changes of the PPP driver interface, IrNET will work only with very
* recent kernel (2.3.99-pre6 and up).
- *
+ *
* The present implementation offer the following features :
* o simple user interface using pppd
* o efficient implementation (interface directly to PPP and IrTTP)
@@ -327,7 +327,7 @@
#define DEBUG_ASSERT 0 /* Verify all assertions */
-/*
+/*
* These are the macros we are using to actually print the debug
* statements. Don't look at it, it's ugly...
*
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)
/* Open an IrTTP instance */
self->tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT,
- &notify);
+ &notify);
DABORT(self->tsap == NULL, -ENOMEM,
IRDA_SR_ERROR, "Unable to allocate TSAP !\n");
@@ -188,7 +188,7 @@ irnet_ias_to_tsap(irnet_socket * self,
if(value->t.integer != -1)
/* Get the remote TSAP selector */
dtsap_sel = value->t.integer;
- else
+ else
self->errno = -EADDRNOTAVAIL;
break;
default:
@@ -280,8 +280,8 @@ irnet_connect_tsap(irnet_socket * self)
}
/* Connect to remote device */
- err = irttp_connect_request(self->tsap, self->dtsap_sel,
- self->rsaddr, self->daddr, NULL,
+ err = irttp_connect_request(self->tsap, self->dtsap_sel,
+ self->rsaddr, self->daddr, NULL,
self->max_sdu_size_rx, NULL);
if(err != 0)
{
@@ -438,7 +438,7 @@ irnet_dname_to_daddr(irnet_socket * self)
if(discoveries == NULL)
DRETURN(-ENETUNREACH, IRDA_SR_INFO, "Cachelog empty...\n");
- /*
+ /*
* Now, check all discovered devices (if any), and connect
* client only about the services that the client is
* interested in...
@@ -627,7 +627,7 @@ irda_irnet_destroy(irnet_socket * self)
/* Unregister with LM-IAS */
if(self->iriap)
- {
+ {
iriap_close(self->iriap);
self->iriap = NULL;
}
@@ -945,7 +945,7 @@ irnet_setup_server(void)
/* Register with LM-IAS (so that people can connect to us) */
irnet_server.ias_obj = irias_new_object(IRNET_SERVICE_NAME, jiffies);
- irias_add_integer_attrib(irnet_server.ias_obj, IRNET_IAS_VALUE,
+ irias_add_integer_attrib(irnet_server.ias_obj, IRNET_IAS_VALUE,
irnet_server.s.stsap_sel, IAS_KERNEL_ATTR);
irias_insert_object(irnet_server.ias_obj);
@@ -1076,7 +1076,7 @@ irnet_data_indication(void * instance,
*/
static void
irnet_disconnect_indication(void * instance,
- void * sap,
+ void * sap,
LM_REASON reason,
struct sk_buff *skb)
{
@@ -1166,10 +1166,10 @@ irnet_disconnect_indication(void * instance,
*/
static void
irnet_connect_confirm(void * instance,
- void * sap,
+ void * sap,
struct qos_info *qos,
__u32 max_sdu_size,
- __u8 max_header_size,
+ __u8 max_header_size,
struct sk_buff *skb)
{
irnet_socket * self = (irnet_socket *) instance;
@@ -1235,7 +1235,7 @@ irnet_connect_confirm(void * instance,
static void
irnet_flow_indication(void * instance,
void * sap,
- LOCAL_FLOW flow)
+ LOCAL_FLOW flow)
{
irnet_socket * self = (irnet_socket *) instance;
LOCAL_FLOW oldflow = self->tx_flow;
@@ -1308,13 +1308,13 @@ irnet_status_indication(void * instance,
* Some other node is attempting to connect to the IrNET service, and has
* sent a connection request on our server socket.
* We just redirect the connection to the relevant IrNET socket.
- *
+ *
* Note : we also make sure that between 2 irnet nodes, there can
* exist only one irnet connection.
*/
static void
irnet_connect_indication(void * instance,
- void * sap,
+ void * sap,
struct qos_info *qos,
__u32 max_sdu_size,
__u8 max_header_size,
@@ -1463,7 +1463,7 @@ irnet_connect_indication(void * instance,
*/
static void
irnet_getvalue_confirm(int result,
- __u16 obj_id,
+ __u16 obj_id,
struct ias_value *value,
void * priv)
{
@@ -1526,7 +1526,7 @@ irnet_getvalue_confirm(int result,
*/
static void
irnet_discovervalue_confirm(int result,
- __u16 obj_id,
+ __u16 obj_id,
struct ias_value *value,
void * priv)
{
@@ -1645,7 +1645,7 @@ irnet_discovery_indication(discinfo_t * discovery,
void * priv)
{
irnet_socket * self = &irnet_server.s;
-
+
DENTER(IRDA_OCB_TRACE, "(self=0x%p)\n", self);
DASSERT(priv == &irnet_server, , IRDA_OCB_ERROR,
"Invalid instance (0x%p) !!!\n", priv);
@@ -1676,7 +1676,7 @@ irnet_expiry_indication(discinfo_t * expiry,
void * priv)
{
irnet_socket * self = &irnet_server.s;
-
+
DENTER(IRDA_OCB_TRACE, "(self=0x%p)\n", self);
DASSERT(priv == &irnet_server, , IRDA_OCB_ERROR,
"Invalid instance (0x%p) !!!\n", priv);
@@ -1718,7 +1718,7 @@ irnet_proc_read(char * buf,
int i = 0;
len = 0;
-
+
/* Get the IrNET server information... */
len += sprintf(buf+len, "IrNET server - ");
len += sprintf(buf+len, "IrDA state: %s, ",
@@ -1811,7 +1811,7 @@ irda_irnet_init(void)
memset(&irnet_server, 0, sizeof(struct irnet_root));
/* Setup start of irnet instance list */
- irnet_server.list = hashbin_new(HB_NOLOCK);
+ irnet_server.list = hashbin_new(HB_NOLOCK);
DABORT(irnet_server.list == NULL, -ENOMEM,
MODULE_ERROR, "Can't allocate hashbin!\n");
/* Init spinlock for instance list */
diff --git a/net/irda/irnet/irnet_irda.h b/net/irda/irnet/irnet_irda.h
index f2fecd32d8f6..0ba92d0d5204 100644
--- a/net/irda/irnet/irnet_irda.h
+++ b/net/irda/irnet/irnet_irda.h
@@ -146,7 +146,7 @@ static void
void *);
static void
irnet_discovervalue_confirm(int,
- __u16,
+ __u16,
struct ias_value *,
void *);
#ifdef DISCOVERY_EVENTS
diff --git a/net/irda/irnet/irnet_ppp.c b/net/irda/irnet/irnet_ppp.c
index a1e502ff9070..2f9f8dce5a69 100644
--- a/net/irda/irnet/irnet_ppp.c
+++ b/net/irda/irnet/irnet_ppp.c
@@ -93,7 +93,7 @@ irnet_ctrl_write(irnet_socket * ap,
/* Check if we recognised one of the known command
* We can't use "switch" with strings, so hack with "continue" */
-
+
/* First command : name -> Requested IrDA nickname */
if(!strncmp(start, "name", 4))
{
@@ -744,7 +744,7 @@ dev_irnet_ioctl(struct inode * inode,
break;
/* Set DTR/RTS */
- case TIOCMBIS:
+ case TIOCMBIS:
case TIOCMBIC:
/* Set exclusive/non-exclusive mode */
case TIOCEXCL:
@@ -941,7 +941,7 @@ ppp_irnet_send(struct ppp_channel * chan,
ret = irttp_data_request(self->tsap, skb);
if(ret < 0)
{
- /*
+ /*
* > IrTTPs tx queue is full, so we just have to
* > drop the frame! You might think that we should
* > just return -1 and don't deallocate the frame,
@@ -949,7 +949,7 @@ ppp_irnet_send(struct ppp_channel * chan,
* > we have replaced the original skb with a new
* > one with larger headroom, and that would really
* > confuse do_dev_queue_xmit() in dev.c! I have
- * > tried :-) DB
+ * > tried :-) DB
* Correction : we verify the flow control above (self->tx_flow),
* so we come here only if IrTTP doesn't like the packet (empty,
* too large, IrTTP not connected). In those rare cases, it's ok
@@ -1136,6 +1136,6 @@ irnet_cleanup(void)
module_init(irnet_init);
module_exit(irnet_cleanup);
MODULE_AUTHOR("Jean Tourrilhes <jt@hpl.hp.com>");
-MODULE_DESCRIPTION("IrNET : Synchronous PPP over IrDA");
+MODULE_DESCRIPTION("IrNET : Synchronous PPP over IrDA");
MODULE_LICENSE("GPL");
MODULE_ALIAS_CHARDEV(10, 187);