Skip to content

L
linux
Commit 8192cb91 authored by Martin Dalecki's avatar Martin Dalecki Committed by Linus Torvalds
Browse files
Options

[PATCH] kill warnings 7/19 

- Fix improper __FUNCTION__ usage in af_irda.c

- Fix redundant white space usage there - I couldn't resist.
parent 5fd11be5
Hide whitespace changes
Inline Side-by-side
Showing with 180 additions and 199 deletions
net/irda/af_irda.c
View file @ 8192cb91
/********************************************************************* /*********************************************************************
* *
* Filename: af_irda.c * Filename: af_irda.c
* Version: 0.9 * Version: 0.9
* Description: IrDA sockets implementation * Description: IrDA sockets implementation
...@@ -9,37 +9,37 @@ ...@@ -9,37 +9,37 @@
* Modified at: Sat Dec 25 21:10:23 1999 * Modified at: Sat Dec 25 21:10:23 1999
* Modified by: Dag Brattli <dag@brattli.net> * Modified by: Dag Brattli <dag@brattli.net>
* Sources: af_netroom.c, af_ax25.c, af_rose.c, af_x25.c etc. * Sources: af_netroom.c, af_ax25.c, af_rose.c, af_x25.c etc.
* *
* Copyright (c) 1999 Dag Brattli <dagb@cs.uit.no> * Copyright (c) 1999 Dag Brattli <dagb@cs.uit.no>
* Copyright (c) 1999-2001 Jean Tourrilhes <jt@hpl.hp.com> * Copyright (c) 1999-2001 Jean Tourrilhes <jt@hpl.hp.com>
* All Rights Reserved. * All Rights Reserved.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version. * the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
* *
* Linux-IrDA now supports four different types of IrDA sockets: * Linux-IrDA now supports four different types of IrDA sockets:
* *
* o SOCK_STREAM: TinyTP connections with SAR disabled. The * o SOCK_STREAM: TinyTP connections with SAR disabled. The
* max SDU size is 0 for conn. of this type * max SDU size is 0 for conn. of this type
* o SOCK_SEQPACKET: TinyTP connections with SAR enabled. TTP may * o SOCK_SEQPACKET: TinyTP connections with SAR enabled. TTP may
* fragment the messages, but will preserve * fragment the messages, but will preserve
* the message boundaries * the message boundaries
* o SOCK_DGRAM: IRDAPROTO_UNITDATA: TinyTP connections with Unitdata * o SOCK_DGRAM: IRDAPROTO_UNITDATA: TinyTP connections with Unitdata
* (unreliable) transfers * (unreliable) transfers
* IRDAPROTO_ULTRA: Connectionless and unreliable data * IRDAPROTO_ULTRA: Connectionless and unreliable data
* *
********************************************************************/ ********************************************************************/
#include <linux/config.h> #include <linux/config.h>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
extern int irda_init(void); extern int irda_init(void);
extern void irda_cleanup(void); extern void irda_cleanup(void);
extern int irlap_driver_rcv(struct sk_buff *, struct net_device *, extern int irlap_driver_rcv(struct sk_buff *, struct net_device *,
struct packet_type *); struct packet_type *);
static int irda_create(struct socket *sock, int protocol); static int irda_create(struct socket *sock, int protocol);
...@@ -125,7 +125,7 @@ static int irda_data_indication(void *instance, void *sap, struct sk_buff *skb) ...@@ -125,7 +125,7 @@ static int irda_data_indication(void *instance, void *sap, struct sk_buff *skb)
* Connection has been closed. Check reason to find out why * Connection has been closed. Check reason to find out why
* *
*/ */
static void irda_disconnect_indication(void *instance, void *sap, static void irda_disconnect_indication(void *instance, void *sap,
LM_REASON reason, struct sk_buff *skb) LM_REASON reason, struct sk_buff *skb)
{ {
struct irda_sock *self; struct irda_sock *self;
...@@ -185,9 +185,9 @@ static void irda_disconnect_indication(void *instance, void *sap, ...@@ -185,9 +185,9 @@ static void irda_disconnect_indication(void *instance, void *sap,
* Connections has been confirmed by the remote device * Connections has been confirmed by the remote device
* *
*/ */
static void irda_connect_confirm(void *instance, void *sap, static void irda_connect_confirm(void *instance, void *sap,
struct qos_info *qos, struct qos_info *qos,
__u32 max_sdu_size, __u8 max_header_size, __u32 max_sdu_size, __u8 max_header_size,
struct sk_buff *skb) struct sk_buff *skb)
{ {
struct irda_sock *self; struct irda_sock *self;
...@@ -211,14 +211,14 @@ static void irda_connect_confirm(void *instance, void *sap, ...@@ -211,14 +211,14 @@ static void irda_connect_confirm(void *instance, void *sap,
switch (sk->type) { switch (sk->type) {
case SOCK_STREAM: case SOCK_STREAM:
if (max_sdu_size != 0) { if (max_sdu_size != 0) {
ERROR(__FUNCTION__ "(), max_sdu_size must be 0\n"); ERROR("%s: max_sdu_size must be 0\n", __FUNCTION__);
return; return;
} }
self->max_data_size = irttp_get_max_seg_size(self->tsap); self->max_data_size = irttp_get_max_seg_size(self->tsap);
break; break;
case SOCK_SEQPACKET: case SOCK_SEQPACKET:
if (max_sdu_size == 0) { if (max_sdu_size == 0) {
ERROR(__FUNCTION__ "(), max_sdu_size cannot be 0\n"); ERROR("%s: max_sdu_size cannot be 0\n", __FUNCTION__);
return; return;
} }
self->max_data_size = max_sdu_size; self->max_data_size = max_sdu_size;
...@@ -227,7 +227,7 @@ static void irda_connect_confirm(void *instance, void *sap, ...@@ -227,7 +227,7 @@ static void irda_connect_confirm(void *instance, void *sap,
self->max_data_size = irttp_get_max_seg_size(self->tsap); self->max_data_size = irttp_get_max_seg_size(self->tsap);
}; };
IRDA_DEBUG(2, __FUNCTION__ "(), max_data_size=%d\n", IRDA_DEBUG(2, __FUNCTION__ "(), max_data_size=%d\n",
self->max_data_size); self->max_data_size);
memcpy(&self->qos_tx, qos, sizeof(struct qos_info)); memcpy(&self->qos_tx, qos, sizeof(struct qos_info));
...@@ -245,14 +245,14 @@ static void irda_connect_confirm(void *instance, void *sap, ...@@ -245,14 +245,14 @@ static void irda_connect_confirm(void *instance, void *sap,
* Incoming connection * Incoming connection
* *
*/ */
static void irda_connect_indication(void *instance, void *sap, static void irda_connect_indication(void *instance, void *sap,
struct qos_info *qos, __u32 max_sdu_size, struct qos_info *qos, __u32 max_sdu_size,
__u8 max_header_size, struct sk_buff *skb) __u8 max_header_size, struct sk_buff *skb)
{ {
struct irda_sock *self; struct irda_sock *self;
struct sock *sk; struct sock *sk;
self = (struct irda_sock *) instance; self = (struct irda_sock *) instance;
IRDA_DEBUG(2, __FUNCTION__ "(%p)\n", self); IRDA_DEBUG(2, __FUNCTION__ "(%p)\n", self);
...@@ -264,20 +264,20 @@ static void irda_connect_indication(void *instance, void *sap, ...@@ -264,20 +264,20 @@ static void irda_connect_indication(void *instance, void *sap,
self->max_header_size = max_header_size; self->max_header_size = max_header_size;
/* IrTTP max SDU size in transmit direction */ /* IrTTP max SDU size in transmit direction */
self->max_sdu_size_tx = max_sdu_size; self->max_sdu_size_tx = max_sdu_size;
/* Find out what the largest chunk of data that we can transmit is */ /* Find out what the largest chunk of data that we can transmit is */
switch (sk->type) { switch (sk->type) {
case SOCK_STREAM: case SOCK_STREAM:
if (max_sdu_size != 0) { if (max_sdu_size != 0) {
ERROR(__FUNCTION__ "(), max_sdu_size must be 0\n"); ERROR("%s: max_sdu_size must be 0\n", __FUNCTION__);
return; return;
} }
self->max_data_size = irttp_get_max_seg_size(self->tsap); self->max_data_size = irttp_get_max_seg_size(self->tsap);
break; break;
case SOCK_SEQPACKET: case SOCK_SEQPACKET:
if (max_sdu_size == 0) { if (max_sdu_size == 0) {
ERROR(__FUNCTION__ "(), max_sdu_size cannot be 0\n"); ERROR("%s: max_sdu_size cannot be 0\n", __FUNCTION__);
return; return;
} }
self->max_data_size = max_sdu_size; self->max_data_size = max_sdu_size;
...@@ -286,11 +286,11 @@ static void irda_connect_indication(void *instance, void *sap, ...@@ -286,11 +286,11 @@ static void irda_connect_indication(void *instance, void *sap,
self->max_data_size = irttp_get_max_seg_size(self->tsap); self->max_data_size = irttp_get_max_seg_size(self->tsap);
}; };
IRDA_DEBUG(2, __FUNCTION__ "(), max_data_size=%d\n", IRDA_DEBUG(2, __FUNCTION__ "(), max_data_size=%d\n",
self->max_data_size); self->max_data_size);
memcpy(&self->qos_tx, qos, sizeof(struct qos_info)); memcpy(&self->qos_tx, qos, sizeof(struct qos_info));
skb_queue_tail(&sk->receive_queue, skb); skb_queue_tail(&sk->receive_queue, skb);
sk->state_change(sk); sk->state_change(sk);
} }
...@@ -327,19 +327,19 @@ void irda_connect_response(struct irda_sock *self) ...@@ -327,19 +327,19 @@ void irda_connect_response(struct irda_sock *self)
* Used by TinyTP to tell us if it can accept more data or not * Used by TinyTP to tell us if it can accept more data or not
* *
*/ */
static void irda_flow_indication(void *instance, void *sap, LOCAL_FLOW flow) static void irda_flow_indication(void *instance, void *sap, LOCAL_FLOW flow)
{ {
struct irda_sock *self; struct irda_sock *self;
struct sock *sk; struct sock *sk;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, __FUNCTION__ "()\n");
self = (struct irda_sock *) instance; self = (struct irda_sock *) instance;
ASSERT(self != NULL, return;); ASSERT(self != NULL, return;);
sk = self->sk; sk = self->sk;
ASSERT(sk != NULL, return;); ASSERT(sk != NULL, return;);
switch (flow) { switch (flow) {
case FLOW_STOP: case FLOW_STOP:
IRDA_DEBUG(1, __FUNCTION__ "(), IrTTP wants us to slow down\n"); IRDA_DEBUG(1, __FUNCTION__ "(), IrTTP wants us to slow down\n");
...@@ -347,7 +347,7 @@ static void irda_flow_indication(void *instance, void *sap, LOCAL_FLOW flow) ...@@ -347,7 +347,7 @@ static void irda_flow_indication(void *instance, void *sap, LOCAL_FLOW flow)
break; break;
case FLOW_START: case FLOW_START:
self->tx_flow = flow; self->tx_flow = flow;
IRDA_DEBUG(1, __FUNCTION__ IRDA_DEBUG(1, __FUNCTION__
"(), IrTTP wants us to start again\n"); "(), IrTTP wants us to start again\n");
wake_up_interruptible(sk->sleep); wake_up_interruptible(sk->sleep);
break; break;
...@@ -367,14 +367,14 @@ static void irda_flow_indication(void *instance, void *sap, LOCAL_FLOW flow) ...@@ -367,14 +367,14 @@ static void irda_flow_indication(void *instance, void *sap, LOCAL_FLOW flow)
* Note : duplicate from above, but we need our own version that * Note : duplicate from above, but we need our own version that
* doesn't touch the dtsap_sel and save the full value structure... * doesn't touch the dtsap_sel and save the full value structure...
*/ */
static void irda_getvalue_confirm(int result, __u16 obj_id, static void irda_getvalue_confirm(int result, __u16 obj_id,
struct ias_value *value, void *priv) struct ias_value *value, void *priv)
{ {
struct irda_sock *self; struct irda_sock *self;
self = (struct irda_sock *) priv; self = (struct irda_sock *) priv;
if (!self) { if (!self) {
WARNING(__FUNCTION__ "(), lost myself!\n"); WARNING("%s: lost myself!\n", __FUNCTION__);
return; return;
} }
...@@ -419,12 +419,12 @@ static void irda_selective_discovery_indication(discovery_t *discovery, ...@@ -419,12 +419,12 @@ static void irda_selective_discovery_indication(discovery_t *discovery,
void *priv) void *priv)
{ {
struct irda_sock *self; struct irda_sock *self;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, __FUNCTION__ "()\n");
self = (struct irda_sock *) priv; self = (struct irda_sock *) priv;
if (!self) { if (!self) {
WARNING(__FUNCTION__ "(), lost myself!\n"); WARNING("%s: lost myself!\n", __FUNCTION__);
return; return;
} }
...@@ -456,7 +456,7 @@ static void irda_selective_discovery_indication(discovery_t *discovery, ...@@ -456,7 +456,7 @@ static void irda_selective_discovery_indication(discovery_t *discovery,
static void irda_discovery_timeout(u_long priv) static void irda_discovery_timeout(u_long priv)
{ {
struct irda_sock *self; struct irda_sock *self;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, __FUNCTION__ "()\n");
self = (struct irda_sock *) priv; self = (struct irda_sock *) priv;
...@@ -482,10 +482,10 @@ static int irda_open_tsap(struct irda_sock *self, __u8 tsap_sel, char *name) ...@@ -482,10 +482,10 @@ static int irda_open_tsap(struct irda_sock *self, __u8 tsap_sel, char *name)
notify_t notify; notify_t notify;
if (self->tsap) { if (self->tsap) {
WARNING(__FUNCTION__ "(), busy!\n"); WARNING("%s: busy!\n", __FUNCTION__);
return -EBUSY; return -EBUSY;
} }
/* Initialize callbacks to be used by the IrDA stack */ /* Initialize callbacks to be used by the IrDA stack */
irda_notify_init(&notify); irda_notify_init(&notify);
notify.connect_confirm = irda_connect_confirm; notify.connect_confirm = irda_connect_confirm;
...@@ -498,7 +498,7 @@ static int irda_open_tsap(struct irda_sock *self, __u8 tsap_sel, char *name) ...@@ -498,7 +498,7 @@ static int irda_open_tsap(struct irda_sock *self, __u8 tsap_sel, char *name)
strncpy(notify.name, name, NOTIFY_MAX_NAME); strncpy(notify.name, name, NOTIFY_MAX_NAME);
self->tsap = irttp_open_tsap(tsap_sel, DEFAULT_INITIAL_CREDIT, self->tsap = irttp_open_tsap(tsap_sel, DEFAULT_INITIAL_CREDIT,
&notify); &notify);
if (self->tsap == NULL) { if (self->tsap == NULL) {
IRDA_DEBUG( 0, __FUNCTION__ "(), Unable to allocate TSAP!\n"); IRDA_DEBUG( 0, __FUNCTION__ "(), Unable to allocate TSAP!\n");
return -ENOMEM; return -ENOMEM;
...@@ -524,14 +524,14 @@ static int irda_open_lsap(struct irda_sock *self, int pid) ...@@ -524,14 +524,14 @@ static int irda_open_lsap(struct irda_sock *self, int pid)
WARNING(__FUNCTION__ "(), busy!\n"); WARNING(__FUNCTION__ "(), busy!\n");
return -EBUSY; return -EBUSY;
} }
/* Initialize callbacks to be used by the IrDA stack */ /* Initialize callbacks to be used by the IrDA stack */
irda_notify_init(&notify); irda_notify_init(&notify);
notify.udata_indication = irda_data_indication; notify.udata_indication = irda_data_indication;
notify.instance = self; notify.instance = self;
strncpy(notify.name, "Ultra", NOTIFY_MAX_NAME); strncpy(notify.name, "Ultra", NOTIFY_MAX_NAME);
self->lsap = irlmp_open_lsap(LSAP_CONNLESS, &notify, pid); self->lsap = irlmp_open_lsap(LSAP_CONNLESS, &notify, pid);
if (self->lsap == NULL) { if (self->lsap == NULL) {
IRDA_DEBUG( 0, __FUNCTION__ "(), Unable to allocate LSAP!\n"); IRDA_DEBUG( 0, __FUNCTION__ "(), Unable to allocate LSAP!\n");
return -ENOMEM; return -ENOMEM;
...@@ -559,7 +559,7 @@ static int irda_find_lsap_sel(struct irda_sock *self, char *name) ...@@ -559,7 +559,7 @@ static int irda_find_lsap_sel(struct irda_sock *self, char *name)
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
if (self->iriap) { if (self->iriap) {
WARNING(__FUNCTION__ "(), busy with a previous query\n"); WARNING("%s: busy with a previous query\n", __FUNCTION__);
return -EBUSY; return -EBUSY;
} }
...@@ -596,10 +596,10 @@ static int irda_find_lsap_sel(struct irda_sock *self, char *name) ...@@ -596,10 +596,10 @@ static int irda_find_lsap_sel(struct irda_sock *self, char *name)
case IAS_INTEGER: case IAS_INTEGER:
IRDA_DEBUG(4, __FUNCTION__ "() int=%d\n", IRDA_DEBUG(4, __FUNCTION__ "() int=%d\n",
self->ias_result->t.integer); self->ias_result->t.integer);
if (self->ias_result->t.integer != -1) if (self->ias_result->t.integer != -1)
self->dtsap_sel = self->ias_result->t.integer; self->dtsap_sel = self->ias_result->t.integer;
else else
self->dtsap_sel = 0; self->dtsap_sel = 0;
break; break;
default: default:
...@@ -655,7 +655,7 @@ static int irda_discover_daddr_and_lsap_sel(struct irda_sock *self, char *name) ...@@ -655,7 +655,7 @@ static int irda_discover_daddr_and_lsap_sel(struct irda_sock *self, char *name)
if (discoveries == NULL) if (discoveries == NULL)
return -ENETUNREACH; /* No nodes discovered */ return -ENETUNREACH; /* No nodes discovered */
/* /*
* Now, check all discovered devices (if any), and connect * Now, check all discovered devices (if any), and connect
* client only about the services that the client is * client only about the services that the client is
* interested in... * interested in...
...@@ -714,7 +714,7 @@ static int irda_discover_daddr_and_lsap_sel(struct irda_sock *self, char *name) ...@@ -714,7 +714,7 @@ static int irda_discover_daddr_and_lsap_sel(struct irda_sock *self, char *name)
self->saddr = 0x0; self->saddr = 0x0;
self->dtsap_sel = dtsap_sel; self->dtsap_sel = dtsap_sel;
IRDA_DEBUG(1, __FUNCTION__ IRDA_DEBUG(1, __FUNCTION__
"(), discovered requested service ''%s'' at address %08x\n", "(), discovered requested service ''%s'' at address %08x\n",
name, self->daddr); name, self->daddr);
...@@ -737,7 +737,7 @@ static int irda_getname(struct socket *sock, struct sockaddr *uaddr, ...@@ -737,7 +737,7 @@ static int irda_getname(struct socket *sock, struct sockaddr *uaddr,
if (peer) { if (peer) {
if (sk->state != TCP_ESTABLISHED) if (sk->state != TCP_ESTABLISHED)
return -ENOTCONN; return -ENOTCONN;
saddr.sir_family = AF_IRDA; saddr.sir_family = AF_IRDA;
saddr.sir_lsap_sel = self->dtsap_sel; saddr.sir_lsap_sel = self->dtsap_sel;
saddr.sir_addr = self->daddr; saddr.sir_addr = self->daddr;
...@@ -746,7 +746,7 @@ static int irda_getname(struct socket *sock, struct sockaddr *uaddr, ...@@ -746,7 +746,7 @@ static int irda_getname(struct socket *sock, struct sockaddr *uaddr,
saddr.sir_lsap_sel = self->stsap_sel; saddr.sir_lsap_sel = self->stsap_sel;
saddr.sir_addr = self->saddr; saddr.sir_addr = self->saddr;
} }
IRDA_DEBUG(1, __FUNCTION__ "(), tsap_sel = %#x\n", saddr.sir_lsap_sel); IRDA_DEBUG(1, __FUNCTION__ "(), tsap_sel = %#x\n", saddr.sir_lsap_sel);
IRDA_DEBUG(1, __FUNCTION__ "(), addr = %08x\n", saddr.sir_addr); IRDA_DEBUG(1, __FUNCTION__ "(), addr = %08x\n", saddr.sir_addr);
...@@ -776,10 +776,10 @@ static int irda_listen(struct socket *sock, int backlog) ...@@ -776,10 +776,10 @@ static int irda_listen(struct socket *sock, int backlog)
if (sk->state != TCP_LISTEN) { if (sk->state != TCP_LISTEN) {
sk->max_ack_backlog = backlog; sk->max_ack_backlog = backlog;
sk->state = TCP_LISTEN; sk->state = TCP_LISTEN;
return 0; return 0;
} }
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
...@@ -808,14 +808,14 @@ static int irda_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) ...@@ -808,14 +808,14 @@ static int irda_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
if ((sk->type == SOCK_DGRAM) && (sk->protocol == IRDAPROTO_ULTRA)) { if ((sk->type == SOCK_DGRAM) && (sk->protocol == IRDAPROTO_ULTRA)) {
self->pid = addr->sir_lsap_sel; self->pid = addr->sir_lsap_sel;
if (self->pid & 0x80) { if (self->pid & 0x80) {
IRDA_DEBUG(0, __FUNCTION__ IRDA_DEBUG(0, __FUNCTION__
"(), extension in PID not supp!\n"); "(), extension in PID not supp!\n");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
err = irda_open_lsap(self, self->pid); err = irda_open_lsap(self, self->pid);
if (err < 0) if (err < 0)
return err; return err;
self->max_data_size = ULTRA_MAX_DATA - LMP_PID_HEADER; self->max_data_size = ULTRA_MAX_DATA - LMP_PID_HEADER;
self->max_header_size = IRDA_MAX_HEADER + LMP_PID_HEADER; self->max_header_size = IRDA_MAX_HEADER + LMP_PID_HEADER;
...@@ -830,13 +830,13 @@ static int irda_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) ...@@ -830,13 +830,13 @@ static int irda_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
err = irda_open_tsap(self, addr->sir_lsap_sel, addr->sir_name); err = irda_open_tsap(self, addr->sir_lsap_sel, addr->sir_name);
if (err < 0) if (err < 0)
return err; return err;
/* Register with LM-IAS */ /* Register with LM-IAS */
self->ias_obj = irias_new_object(addr->sir_name, jiffies); self->ias_obj = irias_new_object(addr->sir_name, jiffies);
irias_add_integer_attrib(self->ias_obj, "IrDA:TinyTP:LsapSel", irias_add_integer_attrib(self->ias_obj, "IrDA:TinyTP:LsapSel",
self->stsap_sel, IAS_KERNEL_ATTR); self->stsap_sel, IAS_KERNEL_ATTR);
irias_insert_object(self->ias_obj); irias_insert_object(self->ias_obj);
return 0; return 0;
} }
...@@ -872,7 +872,7 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags) ...@@ -872,7 +872,7 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags)
(sk->type != SOCK_DGRAM)) (sk->type != SOCK_DGRAM))
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (sk->state != TCP_LISTEN) if (sk->state != TCP_LISTEN)
return -EINVAL; return -EINVAL;
/* /*
...@@ -921,7 +921,7 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags) ...@@ -921,7 +921,7 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags)
return -ERESTARTSYS; return -ERESTARTSYS;
} }
newsk = newsock->sk; newsk = newsock->sk;
newsk->state = TCP_ESTABLISHED; newsk->state = TCP_ESTABLISHED;
new = irda_sk(newsk); new = irda_sk(newsk);
...@@ -933,7 +933,7 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags) ...@@ -933,7 +933,7 @@ static int irda_accept(struct socket *sock, struct socket *newsock, int flags)
IRDA_DEBUG(0, __FUNCTION__ "(), dup failed!\n"); IRDA_DEBUG(0, __FUNCTION__ "(), dup failed!\n");
return -1; return -1;
} }
new->stsap_sel = new->tsap->stsap_sel; new->stsap_sel = new->tsap->stsap_sel;
new->dtsap_sel = new->tsap->dtsap_sel; new->dtsap_sel = new->tsap->dtsap_sel;
new->saddr = irttp_get_saddr(new->tsap); new->saddr = irttp_get_saddr(new->tsap);
...@@ -988,7 +988,7 @@ static int irda_connect(struct socket *sock, struct sockaddr *uaddr, ...@@ -988,7 +988,7 @@ static int irda_connect(struct socket *sock, struct sockaddr *uaddr,
struct sockaddr_irda *addr = (struct sockaddr_irda *) uaddr; struct sockaddr_irda *addr = (struct sockaddr_irda *) uaddr;
struct irda_sock *self = irda_sk(sk); struct irda_sock *self = irda_sk(sk);
int err; int err;
IRDA_DEBUG(2, __FUNCTION__ "(%p)\n", self); IRDA_DEBUG(2, __FUNCTION__ "(%p)\n", self);
/* Don't allow connect for Ultra sockets */ /* Don't allow connect for Ultra sockets */
...@@ -999,16 +999,16 @@ static int irda_connect(struct socket *sock, struct sockaddr *uaddr, ...@@ -999,16 +999,16 @@ static int irda_connect(struct socket *sock, struct sockaddr *uaddr,
sock->state = SS_CONNECTED; sock->state = SS_CONNECTED;
return 0; /* Connect completed during a ERESTARTSYS event */ return 0; /* Connect completed during a ERESTARTSYS event */
} }
if (sk->state == TCP_CLOSE && sock->state == SS_CONNECTING) { if (sk->state == TCP_CLOSE && sock->state == SS_CONNECTING) {
sock->state = SS_UNCONNECTED; sock->state = SS_UNCONNECTED;
return -ECONNREFUSED; return -ECONNREFUSED;
} }
if (sk->state == TCP_ESTABLISHED) if (sk->state == TCP_ESTABLISHED)
return -EISCONN; /* No reconnect on a seqpacket socket */ return -EISCONN; /* No reconnect on a seqpacket socket */
sk->state = TCP_CLOSE; sk->state = TCP_CLOSE;
sock->state = SS_UNCONNECTED; sock->state = SS_UNCONNECTED;
if (addr_len != sizeof(struct sockaddr_irda)) if (addr_len != sizeof(struct sockaddr_irda))
...@@ -1019,7 +1019,7 @@ static int irda_connect(struct socket *sock, struct sockaddr *uaddr, ...@@ -1019,7 +1019,7 @@ static int irda_connect(struct socket *sock, struct sockaddr *uaddr,
/* Try to find one suitable */ /* Try to find one suitable */
err = irda_discover_daddr_and_lsap_sel(self, addr->sir_name); err = irda_discover_daddr_and_lsap_sel(self, addr->sir_name);
if (err) { if (err) {
IRDA_DEBUG(0, __FUNCTION__ IRDA_DEBUG(0, __FUNCTION__
"(), auto-connect failed!\n"); "(), auto-connect failed!\n");
return err; return err;
} }
...@@ -1027,7 +1027,7 @@ static int irda_connect(struct socket *sock, struct sockaddr *uaddr, ...@@ -1027,7 +1027,7 @@ static int irda_connect(struct socket *sock, struct sockaddr *uaddr,
/* Use the one provided by the user */ /* Use the one provided by the user */
self->daddr = addr->sir_addr; self->daddr = addr->sir_addr;
IRDA_DEBUG(1, __FUNCTION__ "(), daddr = %08x\n", self->daddr); IRDA_DEBUG(1, __FUNCTION__ "(), daddr = %08x\n", self->daddr);
/* Query remote LM-IAS */ /* Query remote LM-IAS */
err = irda_find_lsap_sel(self, addr->sir_name); err = irda_find_lsap_sel(self, addr->sir_name);
if (err) { if (err) {
...@@ -1039,14 +1039,14 @@ static int irda_connect(struct socket *sock, struct sockaddr *uaddr, ...@@ -1039,14 +1039,14 @@ static int irda_connect(struct socket *sock, struct sockaddr *uaddr,
/* Check if we have opened a local TSAP */ /* Check if we have opened a local TSAP */
if (!self->tsap) if (!self->tsap)
irda_open_tsap(self, LSAP_ANY, addr->sir_name); irda_open_tsap(self, LSAP_ANY, addr->sir_name);
/* Move to connecting socket, start sending Connect Requests */ /* Move to connecting socket, start sending Connect Requests */
sock->state = SS_CONNECTING; sock->state = SS_CONNECTING;
sk->state = TCP_SYN_SENT; sk->state = TCP_SYN_SENT;
/* Connect to remote device */ /* Connect to remote device */
err = irttp_connect_request(self->tsap, self->dtsap_sel, err = irttp_connect_request(self->tsap, self->dtsap_sel,
self->saddr, self->daddr, NULL, self->saddr, self->daddr, NULL,
self->max_sdu_size_rx, NULL); self->max_sdu_size_rx, NULL);
if (err) { if (err) {
IRDA_DEBUG(0, __FUNCTION__ "(), connect failed!\n"); IRDA_DEBUG(0, __FUNCTION__ "(), connect failed!\n");
...@@ -1064,9 +1064,9 @@ static int irda_connect(struct socket *sock, struct sockaddr *uaddr, ...@@ -1064,9 +1064,9 @@ static int irda_connect(struct socket *sock, struct sockaddr *uaddr,
sock->state = SS_UNCONNECTED; sock->state = SS_UNCONNECTED;
return sock_error(sk); /* Always set at this point */ return sock_error(sk); /* Always set at this point */
} }
sock->state = SS_CONNECTED; sock->state = SS_CONNECTED;
/* At this point, IrLMP has assigned our source address */ /* At this point, IrLMP has assigned our source address */
self->saddr = irttp_get_saddr(self->tsap); self->saddr = irttp_get_saddr(self->tsap);
...@@ -1085,7 +1085,7 @@ static int irda_create(struct socket *sock, int protocol) ...@@ -1085,7 +1085,7 @@ static int irda_create(struct socket *sock, int protocol)
struct irda_sock *self; struct irda_sock *self;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, __FUNCTION__ "()\n");
/* Check for valid socket type */ /* Check for valid socket type */
switch (sock->type) { switch (sock->type) {
case SOCK_STREAM: /* For TTP connections with SAR disabled */ case SOCK_STREAM: /* For TTP connections with SAR disabled */
...@@ -1112,7 +1112,7 @@ static int irda_create(struct socket *sock, int protocol) ...@@ -1112,7 +1112,7 @@ static int irda_create(struct socket *sock, int protocol)
init_waitqueue_head(&self->query_wait); init_waitqueue_head(&self->query_wait);
/* Initialise networking socket struct */ /* Initialise networking socket struct */
sock_init_data(sock, sk); /* Note : set sk->refcnt to 1 */ sock_init_data(sock, sk); /* Note : set sk->refcnt to 1 */
sk->family = PF_IRDA; sk->family = PF_IRDA;
sk->protocol = protocol; sk->protocol = protocol;
...@@ -1141,13 +1141,13 @@ static int irda_create(struct socket *sock, int protocol) ...@@ -1141,13 +1141,13 @@ static int irda_create(struct socket *sock, int protocol)
self->max_sdu_size_rx = TTP_SAR_UNBOUND; self->max_sdu_size_rx = TTP_SAR_UNBOUND;
break; break;
default: default:
ERROR(__FUNCTION__ "(), protocol not supported!\n"); ERROR("%s: protocol not supported!\n", __FUNCTION__);
return -ESOCKTNOSUPPORT; return -ESOCKTNOSUPPORT;
} }
break; break;
default: default:
return -ESOCKTNOSUPPORT; return -ESOCKTNOSUPPORT;
} }
/* Register as a client with IrLMP */ /* Register as a client with IrLMP */
self->ckey = irlmp_register_client(0, NULL, NULL, NULL); self->ckey = irlmp_register_client(0, NULL, NULL, NULL);
...@@ -1202,25 +1202,22 @@ void irda_destroy_socket(struct irda_sock *self) ...@@ -1202,25 +1202,22 @@ void irda_destroy_socket(struct irda_sock *self)
#endif /* CONFIG_IRDA_ULTRA */ #endif /* CONFIG_IRDA_ULTRA */
kfree(self); kfree(self);
MOD_DEC_USE_COUNT; MOD_DEC_USE_COUNT;
return; return;
} }
/* /*
* Function irda_release (sock) * Function irda_release (sock)
*
*
*
*/ */
static int irda_release(struct socket *sock) static int irda_release(struct socket *sock)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
IRDA_DEBUG(2, __FUNCTION__ "()\n"); IRDA_DEBUG(2, __FUNCTION__ "()\n");
if (sk == NULL) if (sk == NULL)
return 0; return 0;
sk->state = TCP_CLOSE; sk->state = TCP_CLOSE;
sk->shutdown |= SEND_SHUTDOWN; sk->shutdown |= SEND_SHUTDOWN;
sk->state_change(sk); sk->state_change(sk);
...@@ -1231,7 +1228,7 @@ static int irda_release(struct socket *sock) ...@@ -1231,7 +1228,7 @@ static int irda_release(struct socket *sock)
irda_sk(sk) = NULL; irda_sk(sk) = NULL;
sock_orphan(sk); sock_orphan(sk);
sock->sk = NULL; sock->sk = NULL;
/* Purge queues (see sock_init_data()) */ /* Purge queues (see sock_init_data()) */
skb_queue_purge(&sk->receive_queue); skb_queue_purge(&sk->receive_queue);
...@@ -1248,7 +1245,7 @@ static int irda_release(struct socket *sock) ...@@ -1248,7 +1245,7 @@ static int irda_release(struct socket *sock)
* 1) This may include IAS request, both in connect and getsockopt. * 1) This may include IAS request, both in connect and getsockopt.
* Unfortunately, the situation is a bit more messy than it looks, * Unfortunately, the situation is a bit more messy than it looks,
* because we close iriap and kfree(self) above. * because we close iriap and kfree(self) above.
* *
* 2) This may include selective discovery in getsockopt. * 2) This may include selective discovery in getsockopt.
* Same stuff as above, irlmp registration and self are gone. * Same stuff as above, irlmp registration and self are gone.
* *
...@@ -1273,10 +1270,10 @@ static int irda_release(struct socket *sock) ...@@ -1273,10 +1270,10 @@ static int irda_release(struct socket *sock)
* Function irda_sendmsg (sock, msg, len, scm) * Function irda_sendmsg (sock, msg, len, scm)
* *
* Send message down to TinyTP. This function is used for both STREAM and * Send message down to TinyTP. This function is used for both STREAM and
* SEQPACK services. This is possible since it forces the client to * SEQPACK services. This is possible since it forces the client to
* fragment the message if necessary * fragment the message if necessary
*/ */
static int irda_sendmsg(struct socket *sock, struct msghdr *msg, int len, static int irda_sendmsg(struct socket *sock, struct msghdr *msg, int len,
struct scm_cookie *scm) struct scm_cookie *scm)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
...@@ -1314,24 +1311,24 @@ static int irda_sendmsg(struct socket *sock, struct msghdr *msg, int len, ...@@ -1314,24 +1311,24 @@ static int irda_sendmsg(struct socket *sock, struct msghdr *msg, int len,
/* Check that we don't send out to big frames */ /* Check that we don't send out to big frames */
if (len > self->max_data_size) { if (len > self->max_data_size) {
IRDA_DEBUG(2, __FUNCTION__ IRDA_DEBUG(2, __FUNCTION__
"(), Chopping frame from %d to %d bytes!\n", len, "(), Chopping frame from %d to %d bytes!\n", len,
self->max_data_size); self->max_data_size);
len = self->max_data_size; len = self->max_data_size;
} }
skb = sock_alloc_send_skb(sk, len + self->max_header_size, skb = sock_alloc_send_skb(sk, len + self->max_header_size,
msg->msg_flags & MSG_DONTWAIT, &err); msg->msg_flags & MSG_DONTWAIT, &err);
if (!skb) if (!skb)
return -ENOBUFS; return -ENOBUFS;
skb_reserve(skb, self->max_header_size); skb_reserve(skb, self->max_header_size);
asmptr = skb->h.raw = skb_put(skb, len); asmptr = skb->h.raw = skb_put(skb, len);
memcpy_fromiovec(asmptr, msg->msg_iov, len); memcpy_fromiovec(asmptr, msg->msg_iov, len);
/* /*
* Just send the message to TinyTP, and let it deal with possible * Just send the message to TinyTP, and let it deal with possible
* errors. No need to duplicate all that here * errors. No need to duplicate all that here
*/ */
err = irttp_data_request(self->tsap, skb); err = irttp_data_request(self->tsap, skb);
...@@ -1349,7 +1346,7 @@ static int irda_sendmsg(struct socket *sock, struct msghdr *msg, int len, ...@@ -1349,7 +1346,7 @@ static int irda_sendmsg(struct socket *sock, struct msghdr *msg, int len,
* Try to receive message and copy it to user. The frame is discarded * Try to receive message and copy it to user. The frame is discarded
* after being read, regardless of how much the user actually read * after being read, regardless of how much the user actually read
*/ */
static int irda_recvmsg_dgram(struct socket *sock, struct msghdr *msg, static int irda_recvmsg_dgram(struct socket *sock, struct msghdr *msg,
int size, int flags, struct scm_cookie *scm) int size, int flags, struct scm_cookie *scm)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
...@@ -1361,16 +1358,16 @@ static int irda_recvmsg_dgram(struct socket *sock, struct msghdr *msg, ...@@ -1361,16 +1358,16 @@ static int irda_recvmsg_dgram(struct socket *sock, struct msghdr *msg,
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT, skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT,
flags & MSG_DONTWAIT, &err); flags & MSG_DONTWAIT, &err);
if (!skb) if (!skb)
return err; return err;
skb->h.raw = skb->data; skb->h.raw = skb->data;
copied = skb->len; copied = skb->len;
if (copied > size) { if (copied > size) {
IRDA_DEBUG(2, __FUNCTION__ IRDA_DEBUG(2, __FUNCTION__
"(), Received truncated frame (%d < %d)!\n", "(), Received truncated frame (%d < %d)!\n",
copied, size); copied, size);
copied = size; copied = size;
...@@ -1423,11 +1420,8 @@ static inline int irda_data_wait(struct sock *sk) ...@@ -1423,11 +1420,8 @@ static inline int irda_data_wait(struct sock *sk)
/* /*
* Function irda_recvmsg_stream (sock, msg, size, flags, scm) * Function irda_recvmsg_stream (sock, msg, size, flags, scm)
*
*
*
*/ */
static int irda_recvmsg_stream(struct socket *sock, struct msghdr *msg, static int irda_recvmsg_stream(struct socket *sock, struct msghdr *msg,
int size, int flags, struct scm_cookie *scm) int size, int flags, struct scm_cookie *scm)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
...@@ -1440,7 +1434,7 @@ static int irda_recvmsg_stream(struct socket *sock, struct msghdr *msg, ...@@ -1440,7 +1434,7 @@ static int irda_recvmsg_stream(struct socket *sock, struct msghdr *msg,
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
if (sock->flags & __SO_ACCEPTCON) if (sock->flags & __SO_ACCEPTCON)
return(-EINVAL); return(-EINVAL);
if (flags & MSG_OOB) if (flags & MSG_OOB)
...@@ -1448,7 +1442,7 @@ static int irda_recvmsg_stream(struct socket *sock, struct msghdr *msg, ...@@ -1448,7 +1442,7 @@ static int irda_recvmsg_stream(struct socket *sock, struct msghdr *msg,
if (flags & MSG_WAITALL) if (flags & MSG_WAITALL)
target = size; target = size;
msg->msg_namelen = 0; msg->msg_namelen = 0;
do { do {
...@@ -1459,11 +1453,11 @@ static int irda_recvmsg_stream(struct socket *sock, struct msghdr *msg, ...@@ -1459,11 +1453,11 @@ static int irda_recvmsg_stream(struct socket *sock, struct msghdr *msg,
if (skb==NULL) { if (skb==NULL) {
if (copied >= target) if (copied >= target)
break; break;
/* /*
* POSIX 1003.1g mandates this order. * POSIX 1003.1g mandates this order.
*/ */
if (sk->err) { if (sk->err) {
return sock_error(sk); return sock_error(sk);
} }
...@@ -1500,7 +1494,7 @@ static int irda_recvmsg_stream(struct socket *sock, struct msghdr *msg, ...@@ -1500,7 +1494,7 @@ static int irda_recvmsg_stream(struct socket *sock, struct msghdr *msg,
break; break;
} }
kfree_skb(skb); kfree_skb(skb);
} else { } else {
IRDA_DEBUG(0, __FUNCTION__ "() questionable!?\n"); IRDA_DEBUG(0, __FUNCTION__ "() questionable!?\n");
...@@ -1542,9 +1536,9 @@ static int irda_sendmsg_dgram(struct socket *sock, struct msghdr *msg, ...@@ -1542,9 +1536,9 @@ static int irda_sendmsg_dgram(struct socket *sock, struct msghdr *msg,
struct sk_buff *skb; struct sk_buff *skb;
unsigned char *asmptr; unsigned char *asmptr;
int err; int err;
IRDA_DEBUG(4, __FUNCTION__ "(), len=%d\n", len); IRDA_DEBUG(4, __FUNCTION__ "(), len=%d\n", len);
if (msg->msg_flags & ~MSG_DONTWAIT) if (msg->msg_flags & ~MSG_DONTWAIT)
return -EINVAL; return -EINVAL;
...@@ -1559,30 +1553,30 @@ static int irda_sendmsg_dgram(struct socket *sock, struct msghdr *msg, ...@@ -1559,30 +1553,30 @@ static int irda_sendmsg_dgram(struct socket *sock, struct msghdr *msg,
self = irda_sk(sk); self = irda_sk(sk);
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
/* /*
* Check that we don't send out to big frames. This is an unreliable * Check that we don't send out to big frames. This is an unreliable
* service, so we have no fragmentation and no coalescence * service, so we have no fragmentation and no coalescence
*/ */
if (len > self->max_data_size) { if (len > self->max_data_size) {
IRDA_DEBUG(0, __FUNCTION__ "(), Warning to much data! " IRDA_DEBUG(0, __FUNCTION__ "(), Warning to much data! "
"Chopping frame from %d to %d bytes!\n", len, "Chopping frame from %d to %d bytes!\n", len,
self->max_data_size); self->max_data_size);
len = self->max_data_size; len = self->max_data_size;
} }
skb = sock_alloc_send_skb(sk, len + self->max_header_size, skb = sock_alloc_send_skb(sk, len + self->max_header_size,
msg->msg_flags & MSG_DONTWAIT, &err); msg->msg_flags & MSG_DONTWAIT, &err);
if (!skb) if (!skb)
return -ENOBUFS; return -ENOBUFS;
skb_reserve(skb, self->max_header_size); skb_reserve(skb, self->max_header_size);
IRDA_DEBUG(4, __FUNCTION__ "(), appending user data\n"); IRDA_DEBUG(4, __FUNCTION__ "(), appending user data\n");
asmptr = skb->h.raw = skb_put(skb, len); asmptr = skb->h.raw = skb_put(skb, len);
memcpy_fromiovec(asmptr, msg->msg_iov, len); memcpy_fromiovec(asmptr, msg->msg_iov, len);
/* /*
* Just send the message to TinyTP, and let it deal with possible * Just send the message to TinyTP, and let it deal with possible
* errors. No need to duplicate all that here * errors. No need to duplicate all that here
*/ */
err = irttp_udata_request(self->tsap, skb); err = irttp_udata_request(self->tsap, skb);
...@@ -1608,9 +1602,9 @@ static int irda_sendmsg_ultra(struct socket *sock, struct msghdr *msg, ...@@ -1608,9 +1602,9 @@ static int irda_sendmsg_ultra(struct socket *sock, struct msghdr *msg,
struct sk_buff *skb; struct sk_buff *skb;
unsigned char *asmptr; unsigned char *asmptr;
int err; int err;
IRDA_DEBUG(4, __FUNCTION__ "(), len=%d\n", len); IRDA_DEBUG(4, __FUNCTION__ "(), len=%d\n", len);
if (msg->msg_flags & ~MSG_DONTWAIT) if (msg->msg_flags & ~MSG_DONTWAIT)
return -EINVAL; return -EINVAL;
...@@ -1622,24 +1616,24 @@ static int irda_sendmsg_ultra(struct socket *sock, struct msghdr *msg, ...@@ -1622,24 +1616,24 @@ static int irda_sendmsg_ultra(struct socket *sock, struct msghdr *msg,
self = irda_sk(sk); self = irda_sk(sk);
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
/* /*
* Check that we don't send out to big frames. This is an unreliable * Check that we don't send out to big frames. This is an unreliable
* service, so we have no fragmentation and no coalescence * service, so we have no fragmentation and no coalescence
*/ */
if (len > self->max_data_size) { if (len > self->max_data_size) {
IRDA_DEBUG(0, __FUNCTION__ "(), Warning to much data! " IRDA_DEBUG(0, __FUNCTION__ "(), Warning to much data! "
"Chopping frame from %d to %d bytes!\n", len, "Chopping frame from %d to %d bytes!\n", len,
self->max_data_size); self->max_data_size);
len = self->max_data_size; len = self->max_data_size;
} }
skb = sock_alloc_send_skb(sk, len + self->max_header_size, skb = sock_alloc_send_skb(sk, len + self->max_header_size,
msg->msg_flags & MSG_DONTWAIT, &err); msg->msg_flags & MSG_DONTWAIT, &err);
if (!skb) if (!skb)
return -ENOBUFS; return -ENOBUFS;
skb_reserve(skb, self->max_header_size); skb_reserve(skb, self->max_header_size);
IRDA_DEBUG(4, __FUNCTION__ "(), appending user data\n"); IRDA_DEBUG(4, __FUNCTION__ "(), appending user data\n");
asmptr = skb->h.raw = skb_put(skb, len); asmptr = skb->h.raw = skb_put(skb, len);
memcpy_fromiovec(asmptr, msg->msg_iov, len); memcpy_fromiovec(asmptr, msg->msg_iov, len);
...@@ -1655,9 +1649,6 @@ static int irda_sendmsg_ultra(struct socket *sock, struct msghdr *msg, ...@@ -1655,9 +1649,6 @@ static int irda_sendmsg_ultra(struct socket *sock, struct msghdr *msg,
/* /*
* Function irda_shutdown (sk, how) * Function irda_shutdown (sk, how)
*
*
*
*/ */
static int irda_shutdown(struct socket *sock, int how) static int irda_shutdown(struct socket *sock, int how)
{ {
...@@ -1693,11 +1684,8 @@ static int irda_shutdown(struct socket *sock, int how) ...@@ -1693,11 +1684,8 @@ static int irda_shutdown(struct socket *sock, int how)
/* /*
* Function irda_poll (file, sock, wait) * Function irda_poll (file, sock, wait)
*
*
*
*/ */
static unsigned int irda_poll(struct file * file, struct socket *sock, static unsigned int irda_poll(struct file * file, struct socket *sock,
poll_table *wait) poll_table *wait)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
...@@ -1732,7 +1720,7 @@ static unsigned int irda_poll(struct file * file, struct socket *sock, ...@@ -1732,7 +1720,7 @@ static unsigned int irda_poll(struct file * file, struct socket *sock,
} }
if (sk->state == TCP_ESTABLISHED) { if (sk->state == TCP_ESTABLISHED) {
if ((self->tx_flow == FLOW_START) && if ((self->tx_flow == FLOW_START) &&
sock_writeable(sk)) sock_writeable(sk))
{ {
mask |= POLLOUT | POLLWRNORM | POLLWRBAND; mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
...@@ -1740,9 +1728,9 @@ static unsigned int irda_poll(struct file * file, struct socket *sock, ...@@ -1740,9 +1728,9 @@ static unsigned int irda_poll(struct file * file, struct socket *sock,
} }
break; break;
case SOCK_SEQPACKET: case SOCK_SEQPACKET:
if ((self->tx_flow == FLOW_START) && if ((self->tx_flow == FLOW_START) &&
sock_writeable(sk)) sock_writeable(sk))
{ {
mask |= POLLOUT | POLLWRNORM | POLLWRBAND; mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
} }
break; break;
...@@ -1752,22 +1740,19 @@ static unsigned int irda_poll(struct file * file, struct socket *sock, ...@@ -1752,22 +1740,19 @@ static unsigned int irda_poll(struct file * file, struct socket *sock,
break; break;
default: default:
break; break;
} }
return mask; return mask;
} }
/* /*
* Function irda_ioctl (sock, cmd, arg) * Function irda_ioctl (sock, cmd, arg)
*
*
*
*/ */
static int irda_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) static int irda_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
IRDA_DEBUG(4, __FUNCTION__ "(), cmd=%#x\n", cmd); IRDA_DEBUG(4, __FUNCTION__ "(), cmd=%#x\n", cmd);
switch (cmd) { switch (cmd) {
case TIOCOUTQ: { case TIOCOUTQ: {
long amount; long amount;
...@@ -1778,7 +1763,7 @@ static int irda_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) ...@@ -1778,7 +1763,7 @@ static int irda_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
case TIOCINQ: { case TIOCINQ: {
struct sk_buff *skb; struct sk_buff *skb;
long amount = 0L; long amount = 0L;
...@@ -1789,18 +1774,18 @@ static int irda_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) ...@@ -1789,18 +1774,18 @@ static int irda_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
case SIOCGSTAMP: case SIOCGSTAMP:
if (sk != NULL) { if (sk != NULL) {
if (sk->stamp.tv_sec == 0) if (sk->stamp.tv_sec == 0)
return -ENOENT; return -ENOENT;
if (copy_to_user((void *)arg, &sk->stamp, if (copy_to_user((void *)arg, &sk->stamp,
sizeof(struct timeval))) sizeof(struct timeval)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
return -EINVAL; return -EINVAL;
case SIOCGIFADDR: case SIOCGIFADDR:
case SIOCSIFADDR: case SIOCSIFADDR:
case SIOCGIFDSTADDR: case SIOCGIFDSTADDR:
...@@ -1811,7 +1796,7 @@ static int irda_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) ...@@ -1811,7 +1796,7 @@ static int irda_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
case SIOCSIFNETMASK: case SIOCSIFNETMASK:
case SIOCGIFMETRIC: case SIOCGIFMETRIC:
case SIOCSIFMETRIC: case SIOCSIFMETRIC:
return -EINVAL; return -EINVAL;
default: default:
IRDA_DEBUG(1, __FUNCTION__ "(), doing device ioctl!\n"); IRDA_DEBUG(1, __FUNCTION__ "(), doing device ioctl!\n");
return dev_ioctl(cmd, (void *) arg); return dev_ioctl(cmd, (void *) arg);
...@@ -1827,23 +1812,23 @@ static int irda_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) ...@@ -1827,23 +1812,23 @@ static int irda_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
* Set some options for the socket * Set some options for the socket
* *
*/ */
static int irda_setsockopt(struct socket *sock, int level, int optname, static int irda_setsockopt(struct socket *sock, int level, int optname,
char *optval, int optlen) char *optval, int optlen)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct irda_sock *self = irda_sk(sk); struct irda_sock *self = irda_sk(sk);
struct irda_ias_set *ias_opt; struct irda_ias_set *ias_opt;
struct ias_object *ias_obj; struct ias_object *ias_obj;
struct ias_attrib * ias_attr; /* Attribute in IAS object */ struct ias_attrib * ias_attr; /* Attribute in IAS object */
int opt; int opt;
ASSERT(self != NULL, return -1;); ASSERT(self != NULL, return -1;);
IRDA_DEBUG(2, __FUNCTION__ "(%p)\n", self); IRDA_DEBUG(2, __FUNCTION__ "(%p)\n", self);
if (level != SOL_IRLMP) if (level != SOL_IRLMP)
return -ENOPROTOOPT; return -ENOPROTOOPT;
switch (optname) { switch (optname) {
case IRLMP_IAS_SET: case IRLMP_IAS_SET:
/* The user want to add an attribute to an existing IAS object /* The user want to add an attribute to an existing IAS object
...@@ -1855,7 +1840,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname, ...@@ -1855,7 +1840,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname,
if (optlen != sizeof(struct irda_ias_set)) if (optlen != sizeof(struct irda_ias_set))
return -EINVAL; return -EINVAL;
ias_opt = kmalloc(sizeof(struct irda_ias_set), GFP_ATOMIC); ias_opt = kmalloc(sizeof(struct irda_ias_set), GFP_ATOMIC);
if (ias_opt == NULL) if (ias_opt == NULL)
return -ENOMEM; return -ENOMEM;
...@@ -1863,7 +1848,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname, ...@@ -1863,7 +1848,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname,
/* Copy query to the driver. */ /* Copy query to the driver. */
if (copy_from_user(ias_opt, (char *)optval, optlen)) { if (copy_from_user(ias_opt, (char *)optval, optlen)) {
kfree(ias_opt); kfree(ias_opt);
return -EFAULT; return -EFAULT;
} }
/* Find the object we target. /* Find the object we target.
...@@ -1907,7 +1892,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname, ...@@ -1907,7 +1892,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname,
/* Add an integer attribute */ /* Add an integer attribute */
irias_add_integer_attrib( irias_add_integer_attrib(
ias_obj, ias_obj,
ias_opt->irda_attrib_name, ias_opt->irda_attrib_name,
ias_opt->attribute.irda_attrib_int, ias_opt->attribute.irda_attrib_int,
IAS_USER_ATTR); IAS_USER_ATTR);
break; break;
...@@ -1921,7 +1906,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname, ...@@ -1921,7 +1906,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname,
/* Add an octet sequence attribute */ /* Add an octet sequence attribute */
irias_add_octseq_attrib( irias_add_octseq_attrib(
ias_obj, ias_obj,
ias_opt->irda_attrib_name, ias_opt->irda_attrib_name,
ias_opt->attribute.irda_attrib_octet_seq.octet_seq, ias_opt->attribute.irda_attrib_octet_seq.octet_seq,
ias_opt->attribute.irda_attrib_octet_seq.len, ias_opt->attribute.irda_attrib_octet_seq.len,
IAS_USER_ATTR); IAS_USER_ATTR);
...@@ -1939,7 +1924,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname, ...@@ -1939,7 +1924,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname,
/* Add a string attribute */ /* Add a string attribute */
irias_add_string_attrib( irias_add_string_attrib(
ias_obj, ias_obj,
ias_opt->irda_attrib_name, ias_opt->irda_attrib_name,
ias_opt->attribute.irda_attrib_string.string, ias_opt->attribute.irda_attrib_string.string,
IAS_USER_ATTR); IAS_USER_ATTR);
break; break;
...@@ -1958,15 +1943,15 @@ static int irda_setsockopt(struct socket *sock, int level, int optname, ...@@ -1958,15 +1943,15 @@ static int irda_setsockopt(struct socket *sock, int level, int optname,
if (optlen != sizeof(struct irda_ias_set)) if (optlen != sizeof(struct irda_ias_set))
return -EINVAL; return -EINVAL;
ias_opt = kmalloc(sizeof(struct irda_ias_set), GFP_ATOMIC); ias_opt = kmalloc(sizeof(struct irda_ias_set), GFP_ATOMIC);
if (ias_opt == NULL) if (ias_opt == NULL)
return -ENOMEM; return -ENOMEM;
/* Copy query to the driver. */ /* Copy query to the driver. */
if (copy_from_user(ias_opt, (char *)optval, optlen)) { if (copy_from_user(ias_opt, (char *)optval, optlen)) {
kfree(ias_opt); kfree(ias_opt);
return -EFAULT; return -EFAULT;
} }
/* Find the object we target. /* Find the object we target.
...@@ -1993,7 +1978,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname, ...@@ -1993,7 +1978,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname,
/* Find the attribute (in the object) we target */ /* Find the attribute (in the object) we target */
ias_attr = irias_find_attrib(ias_obj, ias_attr = irias_find_attrib(ias_obj,
ias_opt->irda_attrib_name); ias_opt->irda_attrib_name);
if(ias_attr == (struct ias_attrib *) NULL) { if(ias_attr == (struct ias_attrib *) NULL) {
kfree(ias_opt); kfree(ias_opt);
return -EINVAL; return -EINVAL;
...@@ -2001,7 +1986,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname, ...@@ -2001,7 +1986,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname,
/* Check is the user space own the object */ /* Check is the user space own the object */
if(ias_attr->value->owner != IAS_USER_ATTR) { if(ias_attr->value->owner != IAS_USER_ATTR) {
IRDA_DEBUG(1, __FUNCTION__ IRDA_DEBUG(1, __FUNCTION__
"(), attempting to delete a kernel attribute\n"); "(), attempting to delete a kernel attribute\n");
kfree(ias_opt); kfree(ias_opt);
return -EPERM; return -EPERM;
...@@ -2014,26 +1999,25 @@ static int irda_setsockopt(struct socket *sock, int level, int optname, ...@@ -2014,26 +1999,25 @@ static int irda_setsockopt(struct socket *sock, int level, int optname,
case IRLMP_MAX_SDU_SIZE: case IRLMP_MAX_SDU_SIZE:
if (optlen < sizeof(int)) if (optlen < sizeof(int))
return -EINVAL; return -EINVAL;
if (get_user(opt, (int *)optval)) if (get_user(opt, (int *)optval))
return -EFAULT; return -EFAULT;
/* Only possible for a seqpacket service (TTP with SAR) */ /* Only possible for a seqpacket service (TTP with SAR) */
if (sk->type != SOCK_SEQPACKET) { if (sk->type != SOCK_SEQPACKET) {
IRDA_DEBUG(2, __FUNCTION__ IRDA_DEBUG(2, __FUNCTION__
"(), setting max_sdu_size = %d\n", opt); "(), setting max_sdu_size = %d\n", opt);
self->max_sdu_size_rx = opt; self->max_sdu_size_rx = opt;
} else { } else {
WARNING(__FUNCTION__ WARNING("%s: not allowed to set MAXSDUSIZE for this socket type!\n",
"(), not allowed to set MAXSDUSIZE for this " __FUNCTION__);
"socket type!\n");
return -ENOPROTOOPT; return -ENOPROTOOPT;
} }
break; break;
case IRLMP_HINTS_SET: case IRLMP_HINTS_SET:
if (optlen < sizeof(int)) if (optlen < sizeof(int))
return -EINVAL; return -EINVAL;
if (get_user(opt, (int *)optval)) if (get_user(opt, (int *)optval))
return -EFAULT; return -EFAULT;
...@@ -2051,7 +2035,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname, ...@@ -2051,7 +2035,7 @@ static int irda_setsockopt(struct socket *sock, int level, int optname,
*/ */
if (optlen < sizeof(int)) if (optlen < sizeof(int))
return -EINVAL; return -EINVAL;
if (get_user(opt, (int *)optval)) if (get_user(opt, (int *)optval))
return -EFAULT; return -EFAULT;
...@@ -2112,20 +2096,17 @@ static int irda_extract_ias_value(struct irda_ias_set *ias_opt, ...@@ -2112,20 +2096,17 @@ static int irda_extract_ias_value(struct irda_ias_set *ias_opt,
default : default :
return -EINVAL; return -EINVAL;
} }
/* Copy type over */ /* Copy type over */
ias_opt->irda_attrib_type = ias_value->type; ias_opt->irda_attrib_type = ias_value->type;
return 0; return 0;
} }
/* /*
* Function irda_getsockopt (sock, level, optname, optval, optlen) * Function irda_getsockopt (sock, level, optname, optval, optlen)
*
*
*
*/ */
static int irda_getsockopt(struct socket *sock, int level, int optname, static int irda_getsockopt(struct socket *sock, int level, int optname,
char *optval, int *optlen) char *optval, int *optlen)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
...@@ -2151,7 +2132,7 @@ static int irda_getsockopt(struct socket *sock, int level, int optname, ...@@ -2151,7 +2132,7 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
if(len < 0) if(len < 0)
return -EINVAL; return -EINVAL;
switch (optname) { switch (optname) {
case IRLMP_ENUMDEVICES: case IRLMP_ENUMDEVICES:
/* Ask lmp for the current discovery log */ /* Ask lmp for the current discovery log */
...@@ -2163,13 +2144,13 @@ static int irda_getsockopt(struct socket *sock, int level, int optname, ...@@ -2163,13 +2144,13 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
err = 0; err = 0;
/* Write total list length back to client */ /* Write total list length back to client */
if (copy_to_user(optval, &list, if (copy_to_user(optval, &list,
sizeof(struct irda_device_list) - sizeof(struct irda_device_list) -
sizeof(struct irda_device_info))) sizeof(struct irda_device_info)))
err = -EFAULT; err = -EFAULT;
/* Offset to first device entry */ /* Offset to first device entry */
offset = sizeof(struct irda_device_list) - offset = sizeof(struct irda_device_list) -
sizeof(struct irda_device_info); sizeof(struct irda_device_info);
/* Copy the list itself - watch for overflow */ /* Copy the list itself - watch for overflow */
...@@ -2198,7 +2179,7 @@ static int irda_getsockopt(struct socket *sock, int level, int optname, ...@@ -2198,7 +2179,7 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
len = sizeof(int); len = sizeof(int);
if (put_user(len, optlen)) if (put_user(len, optlen))
return -EFAULT; return -EFAULT;
if (copy_to_user(optval, &val, len)) if (copy_to_user(optval, &val, len))
return -EFAULT; return -EFAULT;
break; break;
...@@ -2218,7 +2199,7 @@ static int irda_getsockopt(struct socket *sock, int level, int optname, ...@@ -2218,7 +2199,7 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
/* Copy query to the driver. */ /* Copy query to the driver. */
if (copy_from_user((char *) ias_opt, (char *)optval, len)) { if (copy_from_user((char *) ias_opt, (char *)optval, len)) {
kfree(ias_opt); kfree(ias_opt);
return -EFAULT; return -EFAULT;
} }
/* Find the object we target. /* Find the object we target.
...@@ -2236,7 +2217,7 @@ static int irda_getsockopt(struct socket *sock, int level, int optname, ...@@ -2236,7 +2217,7 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
/* Find the attribute (in the object) we target */ /* Find the attribute (in the object) we target */
ias_attr = irias_find_attrib(ias_obj, ias_attr = irias_find_attrib(ias_obj,
ias_opt->irda_attrib_name); ias_opt->irda_attrib_name);
if(ias_attr == (struct ias_attrib *) NULL) { if(ias_attr == (struct ias_attrib *) NULL) {
kfree(ias_opt); kfree(ias_opt);
return -EINVAL; return -EINVAL;
...@@ -2253,7 +2234,7 @@ static int irda_getsockopt(struct socket *sock, int level, int optname, ...@@ -2253,7 +2234,7 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
if (copy_to_user((char *)optval, (char *) ias_opt, if (copy_to_user((char *)optval, (char *) ias_opt,
sizeof(struct irda_ias_set))) { sizeof(struct irda_ias_set))) {
kfree(ias_opt); kfree(ias_opt);
return -EFAULT; return -EFAULT;
} }
/* Note : don't need to put optlen, we checked it */ /* Note : don't need to put optlen, we checked it */
kfree(ias_opt); kfree(ias_opt);
...@@ -2274,7 +2255,7 @@ static int irda_getsockopt(struct socket *sock, int level, int optname, ...@@ -2274,7 +2255,7 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
/* Copy query to the driver. */ /* Copy query to the driver. */
if (copy_from_user((char *) ias_opt, (char *)optval, len)) { if (copy_from_user((char *) ias_opt, (char *)optval, len)) {
kfree(ias_opt); kfree(ias_opt);
return -EFAULT; return -EFAULT;
} }
/* At this point, there are two cases... /* At this point, there are two cases...
...@@ -2301,8 +2282,8 @@ static int irda_getsockopt(struct socket *sock, int level, int optname, ...@@ -2301,8 +2282,8 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
/* Check that we can proceed with IAP */ /* Check that we can proceed with IAP */
if (self->iriap) { if (self->iriap) {
WARNING(__FUNCTION__ WARNING("%s: busy with a previous query\n",
"(), busy with a previous query\n"); __FUNCTION__);
kfree(ias_opt); kfree(ias_opt);
return -EBUSY; return -EBUSY;
} }
...@@ -2359,7 +2340,7 @@ static int irda_getsockopt(struct socket *sock, int level, int optname, ...@@ -2359,7 +2340,7 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
if (copy_to_user((char *)optval, (char *) ias_opt, if (copy_to_user((char *)optval, (char *) ias_opt,
sizeof(struct irda_ias_set))) { sizeof(struct irda_ias_set))) {
kfree(ias_opt); kfree(ias_opt);
return -EFAULT; return -EFAULT;
} }
/* Note : don't need to put optlen, we checked it */ /* Note : don't need to put optlen, we checked it */
kfree(ias_opt); kfree(ias_opt);
...@@ -2398,7 +2379,7 @@ static int irda_getsockopt(struct socket *sock, int level, int optname, ...@@ -2398,7 +2379,7 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
if (!self->cachediscovery) { if (!self->cachediscovery) {
int ret = 0; int ret = 0;
IRDA_DEBUG(1, __FUNCTION__ IRDA_DEBUG(1, __FUNCTION__
"(), nothing discovered yet, going to sleep...\n"); "(), nothing discovered yet, going to sleep...\n");
/* Set watchdog timer to expire in <val> ms. */ /* Set watchdog timer to expire in <val> ms. */
...@@ -2417,14 +2398,14 @@ static int irda_getsockopt(struct socket *sock, int level, int optname, ...@@ -2417,14 +2398,14 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
if(timer_pending(&(self->watchdog))) if(timer_pending(&(self->watchdog)))
del_timer(&(self->watchdog)); del_timer(&(self->watchdog));
IRDA_DEBUG(1, __FUNCTION__ IRDA_DEBUG(1, __FUNCTION__
"(), ...waking up !\n"); "(), ...waking up !\n");
if (ret != 0) if (ret != 0)
return ret; return ret;
} }
else else
IRDA_DEBUG(1, __FUNCTION__ IRDA_DEBUG(1, __FUNCTION__
"(), found immediately !\n"); "(), found immediately !\n");
/* Tell IrLMP that we have been notified */ /* Tell IrLMP that we have been notified */
...@@ -2445,7 +2426,7 @@ static int irda_getsockopt(struct socket *sock, int level, int optname, ...@@ -2445,7 +2426,7 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
default: default:
return -ENOPROTOOPT; return -ENOPROTOOPT;
} }
return 0; return 0;
} }
...@@ -2456,7 +2437,7 @@ static struct net_proto_family irda_family_ops = { ...@@ -2456,7 +2437,7 @@ static struct net_proto_family irda_family_ops = {
static struct proto_ops SOCKOPS_WRAPPED(irda_stream_ops) = { static struct proto_ops SOCKOPS_WRAPPED(irda_stream_ops) = {
family: PF_IRDA, family: PF_IRDA,
release: irda_release, release: irda_release,
bind: irda_bind, bind: irda_bind,
connect: irda_connect, connect: irda_connect,
...@@ -2477,7 +2458,7 @@ static struct proto_ops SOCKOPS_WRAPPED(irda_stream_ops) = { ...@@ -2477,7 +2458,7 @@ static struct proto_ops SOCKOPS_WRAPPED(irda_stream_ops) = {
static struct proto_ops SOCKOPS_WRAPPED(irda_seqpacket_ops) = { static struct proto_ops SOCKOPS_WRAPPED(irda_seqpacket_ops) = {
family: PF_IRDA, family: PF_IRDA,
release: irda_release, release: irda_release,
bind: irda_bind, bind: irda_bind,
connect: irda_connect, connect: irda_connect,
...@@ -2498,7 +2479,7 @@ static struct proto_ops SOCKOPS_WRAPPED(irda_seqpacket_ops) = { ...@@ -2498,7 +2479,7 @@ static struct proto_ops SOCKOPS_WRAPPED(irda_seqpacket_ops) = {
static struct proto_ops SOCKOPS_WRAPPED(irda_dgram_ops) = { static struct proto_ops SOCKOPS_WRAPPED(irda_dgram_ops) = {
family: PF_IRDA, family: PF_IRDA,
release: irda_release, release: irda_release,
bind: irda_bind, bind: irda_bind,
connect: irda_connect, connect: irda_connect,
...@@ -2520,7 +2501,7 @@ static struct proto_ops SOCKOPS_WRAPPED(irda_dgram_ops) = { ...@@ -2520,7 +2501,7 @@ static struct proto_ops SOCKOPS_WRAPPED(irda_dgram_ops) = {
#ifdef CONFIG_IRDA_ULTRA #ifdef CONFIG_IRDA_ULTRA
static struct proto_ops SOCKOPS_WRAPPED(irda_ultra_ops) = { static struct proto_ops SOCKOPS_WRAPPED(irda_ultra_ops) = {
family: PF_IRDA, family: PF_IRDA,
release: irda_release, release: irda_release,
bind: irda_bind, bind: irda_bind,
connect: sock_no_connect, connect: sock_no_connect,
...@@ -2558,11 +2539,11 @@ static int irda_device_event(struct notifier_block *this, unsigned long event, ...@@ -2558,11 +2539,11 @@ static int irda_device_event(struct notifier_block *this, unsigned long event,
void *ptr) void *ptr)
{ {
struct net_device *dev = (struct net_device *) ptr; struct net_device *dev = (struct net_device *) ptr;
/* Reject non IrDA devices */ /* Reject non IrDA devices */
if (dev->type != ARPHRD_IRDA) if (dev->type != ARPHRD_IRDA)
return NOTIFY_DONE; return NOTIFY_DONE;
switch (event) { switch (event) {
case NETDEV_UP: case NETDEV_UP:
IRDA_DEBUG(3, __FUNCTION__ "(), NETDEV_UP\n"); IRDA_DEBUG(3, __FUNCTION__ "(), NETDEV_UP\n");
...@@ -2581,7 +2562,7 @@ static int irda_device_event(struct notifier_block *this, unsigned long event, ...@@ -2581,7 +2562,7 @@ static int irda_device_event(struct notifier_block *this, unsigned long event,
return NOTIFY_DONE; return NOTIFY_DONE;
} }
static struct packet_type irda_packet_type = static struct packet_type irda_packet_type =
{ {
0, /* MUTTER ntohs(ETH_P_IRDA),*/ 0, /* MUTTER ntohs(ETH_P_IRDA),*/
NULL, NULL,
...@@ -2630,7 +2611,7 @@ int __init irda_proto_init(void) ...@@ -2630,7 +2611,7 @@ int __init irda_proto_init(void)
register_netdevice_notifier(&irda_dev_notifier); register_netdevice_notifier(&irda_dev_notifier);
irda_init(); irda_init();
irda_device_init(); irda_device_init();
return 0; return 0;
} }
...@@ -2649,16 +2630,16 @@ void irda_proto_cleanup(void) ...@@ -2649,16 +2630,16 @@ void irda_proto_cleanup(void)
dev_remove_pack(&irda_packet_type); dev_remove_pack(&irda_packet_type);
unregister_netdevice_notifier(&irda_dev_notifier); unregister_netdevice_notifier(&irda_dev_notifier);
sock_unregister(PF_IRDA); sock_unregister(PF_IRDA);
irda_cleanup(); irda_cleanup();
return; return;
} }
module_exit(irda_proto_cleanup); module_exit(irda_proto_cleanup);
MODULE_AUTHOR("Dag Brattli <dagb@cs.uit.no>"); MODULE_AUTHOR("Dag Brattli <dagb@cs.uit.no>");
MODULE_DESCRIPTION("The Linux IrDA Protocol Subsystem"); MODULE_DESCRIPTION("The Linux IrDA Protocol Subsystem");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#ifdef CONFIG_IRDA_DEBUG #ifdef CONFIG_IRDA_DEBUG
MODULE_PARM(irda_debug, "1l"); MODULE_PARM(irda_debug, "1l");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7