git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
irda
/
ircomm
/
ircomm_param.c
diff --git
a/net/irda/ircomm/ircomm_param.c
b/net/irda/ircomm/ircomm_param.c
index
703e8aa
..
a39f573
100644
(file)
--- a/
net/irda/ircomm/ircomm_param.c
+++ b/
net/irda/ircomm/ircomm_param.c
@@
-106,8
+106,8
@@
int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush)
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
- ASSERT(self != NULL, return -1;);
- ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
+
IRDA_
ASSERT(self != NULL, return -1;);
+
IRDA_
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
tty = self->tty;
if (!tty)
tty = self->tty;
if (!tty)
@@
-121,7
+121,7
@@
int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush)
skb = self->ctrl_skb;
if (!skb) {
skb = self->ctrl_skb;
if (!skb) {
- skb =
dev_alloc_skb(256
);
+ skb =
alloc_skb(256, GFP_ATOMIC
);
if (!skb) {
spin_unlock_irqrestore(&self->spinlock, flags);
return -ENOMEM;
if (!skb) {
spin_unlock_irqrestore(&self->spinlock, flags);
return -ENOMEM;
@@
-137,7
+137,7
@@
int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush)
count = irda_param_insert(self, pi, skb->tail, skb_tailroom(skb),
&ircomm_param_info);
if (count < 0) {
count = irda_param_insert(self, pi, skb->tail, skb_tailroom(skb),
&ircomm_param_info);
if (count < 0) {
- WARNING("%s(), no room for parameter!\n", __FUNCTION__);
+
IRDA_
WARNING("%s(), no room for parameter!\n", __FUNCTION__);
spin_unlock_irqrestore(&self->spinlock, flags);
return -1;
}
spin_unlock_irqrestore(&self->spinlock, flags);
return -1;
}
@@
-168,8
+168,8
@@
static int ircomm_param_service_type(void *instance, irda_param_t *param,
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
__u8 service_type = (__u8) param->pv.i;
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
__u8 service_type = (__u8) param->pv.i;
- ASSERT(self != NULL, return -1;);
- ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
+
IRDA_
ASSERT(self != NULL, return -1;);
+
IRDA_
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
if (get) {
param->pv.i = self->settings.service_type;
if (get) {
param->pv.i = self->settings.service_type;
@@
-233,8
+233,8
@@
static int ircomm_param_port_type(void *instance, irda_param_t *param, int get)
{
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
{
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
- ASSERT(self != NULL, return -1;);
- ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
+
IRDA_
ASSERT(self != NULL, return -1;);
+
IRDA_
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
if (get)
param->pv.i = IRCOMM_SERIAL;
if (get)
param->pv.i = IRCOMM_SERIAL;
@@
-257,8
+257,8
@@
static int ircomm_param_port_name(void *instance, irda_param_t *param, int get)
{
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
{
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
- ASSERT(self != NULL, return -1;);
- ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
+
IRDA_
ASSERT(self != NULL, return -1;);
+
IRDA_
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
if (get) {
IRDA_DEBUG(0, "%s(), not imp!\n", __FUNCTION__ );
if (get) {
IRDA_DEBUG(0, "%s(), not imp!\n", __FUNCTION__ );
@@
-280,8
+280,8
@@
static int ircomm_param_data_rate(void *instance, irda_param_t *param, int get)
{
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
{
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
- ASSERT(self != NULL, return -1;);
- ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
+
IRDA_
ASSERT(self != NULL, return -1;);
+
IRDA_
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
if (get)
param->pv.i = self->settings.data_rate;
if (get)
param->pv.i = self->settings.data_rate;
@@
-304,8
+304,8
@@
static int ircomm_param_data_format(void *instance, irda_param_t *param,
{
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
{
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
- ASSERT(self != NULL, return -1;);
- ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
+
IRDA_
ASSERT(self != NULL, return -1;);
+
IRDA_
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
if (get)
param->pv.i = self->settings.data_format;
if (get)
param->pv.i = self->settings.data_format;
@@
-326,8
+326,8
@@
static int ircomm_param_flow_control(void *instance, irda_param_t *param,
{
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
{
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
- ASSERT(self != NULL, return -1;);
- ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
+
IRDA_
ASSERT(self != NULL, return -1;);
+
IRDA_
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
if (get)
param->pv.i = self->settings.flow_control;
if (get)
param->pv.i = self->settings.flow_control;
@@
-349,8
+349,8
@@
static int ircomm_param_xon_xoff(void *instance, irda_param_t *param, int get)
{
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
{
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
- ASSERT(self != NULL, return -1;);
- ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
+
IRDA_
ASSERT(self != NULL, return -1;);
+
IRDA_
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
if (get) {
param->pv.i = self->settings.xonxoff[0];
if (get) {
param->pv.i = self->settings.xonxoff[0];
@@
-376,8
+376,8
@@
static int ircomm_param_enq_ack(void *instance, irda_param_t *param, int get)
{
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
{
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
- ASSERT(self != NULL, return -1;);
- ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
+
IRDA_
ASSERT(self != NULL, return -1;);
+
IRDA_
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
if (get) {
param->pv.i = self->settings.enqack[0];
if (get) {
param->pv.i = self->settings.enqack[0];
@@
-418,8
+418,8
@@
static int ircomm_param_dte(void *instance, irda_param_t *param, int get)
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
__u8 dte;
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
__u8 dte;
- ASSERT(self != NULL, return -1;);
- ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
+
IRDA_
ASSERT(self != NULL, return -1;);
+
IRDA_
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
if (get)
param->pv.i = self->settings.dte;
if (get)
param->pv.i = self->settings.dte;
@@
-467,8
+467,8
@@
static int ircomm_param_dce(void *instance, irda_param_t *param, int get)
dce = (__u8) param->pv.i;
dce = (__u8) param->pv.i;
- ASSERT(self != NULL, return -1;);
- ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
+
IRDA_
ASSERT(self != NULL, return -1;);
+
IRDA_
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
self->settings.dce = dce;
self->settings.dce = dce;
@@
-494,8
+494,8
@@
static int ircomm_param_poll(void *instance, irda_param_t *param, int get)
{
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
{
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
- ASSERT(self != NULL, return -1;);
- ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
+
IRDA_
ASSERT(self != NULL, return -1;);
+
IRDA_
ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
/* Poll parameters are always of lenght 0 (just a signal) */
if (!get) {
/* Poll parameters are always of lenght 0 (just a signal) */
if (!get) {