diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-31 08:59:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-31 08:59:59 -0400 |
| commit | b1b934d31d8a608fe69fc56d6e539548b55b0601 (patch) | |
| tree | e8206589759c732a3a9b70b3feeb9ef50dc3c6b3 /net/irda/ircomm | |
| parent | 5dd9feafb351a8bf304292623cbc63335c34d279 (diff) | |
| parent | b6ff50833ad43a8ebd9b16bf53c334f7aaf33c41 (diff) | |
Merge branch 'master'
Diffstat (limited to 'net/irda/ircomm')
| -rw-r--r-- | net/irda/ircomm/ircomm_core.c | 4 | ||||
| -rw-r--r-- | net/irda/ircomm/ircomm_lmp.c | 4 | ||||
| -rw-r--r-- | net/irda/ircomm/ircomm_param.c | 2 | ||||
| -rw-r--r-- | net/irda/ircomm/ircomm_tty.c | 8 |
4 files changed, 8 insertions, 10 deletions
diff --git a/net/irda/ircomm/ircomm_core.c b/net/irda/ircomm/ircomm_core.c index 9c4a902a9dba..ad6b6af3dd97 100644 --- a/net/irda/ircomm/ircomm_core.c +++ b/net/irda/ircomm/ircomm_core.c | |||
| @@ -115,12 +115,10 @@ struct ircomm_cb *ircomm_open(notify_t *notify, __u8 service_type, int line) | |||
| 115 | 115 | ||
| 116 | IRDA_ASSERT(ircomm != NULL, return NULL;); | 116 | IRDA_ASSERT(ircomm != NULL, return NULL;); |
| 117 | 117 | ||
| 118 | self = kmalloc(sizeof(struct ircomm_cb), GFP_ATOMIC); | 118 | self = kzalloc(sizeof(struct ircomm_cb), GFP_ATOMIC); |
| 119 | if (self == NULL) | 119 | if (self == NULL) |
| 120 | return NULL; | 120 | return NULL; |
| 121 | 121 | ||
| 122 | memset(self, 0, sizeof(struct ircomm_cb)); | ||
| 123 | |||
| 124 | self->notify = *notify; | 122 | self->notify = *notify; |
| 125 | self->magic = IRCOMM_MAGIC; | 123 | self->magic = IRCOMM_MAGIC; |
| 126 | 124 | ||
diff --git a/net/irda/ircomm/ircomm_lmp.c b/net/irda/ircomm/ircomm_lmp.c index d9097207aed3..959874b6451f 100644 --- a/net/irda/ircomm/ircomm_lmp.c +++ b/net/irda/ircomm/ircomm_lmp.c | |||
| @@ -81,7 +81,7 @@ static int ircomm_lmp_connect_response(struct ircomm_cb *self, | |||
| 81 | 81 | ||
| 82 | /* Any userdata supplied? */ | 82 | /* Any userdata supplied? */ |
| 83 | if (userdata == NULL) { | 83 | if (userdata == NULL) { |
| 84 | tx_skb = dev_alloc_skb(64); | 84 | tx_skb = alloc_skb(64, GFP_ATOMIC); |
| 85 | if (!tx_skb) | 85 | if (!tx_skb) |
| 86 | return -ENOMEM; | 86 | return -ENOMEM; |
| 87 | 87 | ||
| @@ -115,7 +115,7 @@ static int ircomm_lmp_disconnect_request(struct ircomm_cb *self, | |||
| 115 | IRDA_DEBUG(0, "%s()\n", __FUNCTION__ ); | 115 | IRDA_DEBUG(0, "%s()\n", __FUNCTION__ ); |
| 116 | 116 | ||
| 117 | if (!userdata) { | 117 | if (!userdata) { |
| 118 | tx_skb = dev_alloc_skb(64); | 118 | tx_skb = alloc_skb(64, GFP_ATOMIC); |
| 119 | if (!tx_skb) | 119 | if (!tx_skb) |
| 120 | return -ENOMEM; | 120 | return -ENOMEM; |
| 121 | 121 | ||
diff --git a/net/irda/ircomm/ircomm_param.c b/net/irda/ircomm/ircomm_param.c index 6009bab05091..a39f5735a90b 100644 --- a/net/irda/ircomm/ircomm_param.c +++ b/net/irda/ircomm/ircomm_param.c | |||
| @@ -121,7 +121,7 @@ int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush) | |||
| 121 | 121 | ||
| 122 | skb = self->ctrl_skb; | 122 | skb = self->ctrl_skb; |
| 123 | if (!skb) { | 123 | if (!skb) { |
| 124 | skb = dev_alloc_skb(256); | 124 | skb = alloc_skb(256, GFP_ATOMIC); |
| 125 | if (!skb) { | 125 | if (!skb) { |
| 126 | spin_unlock_irqrestore(&self->spinlock, flags); | 126 | spin_unlock_irqrestore(&self->spinlock, flags); |
| 127 | return -ENOMEM; | 127 | return -ENOMEM; |
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c index b400f27851fc..3bcdb467efc5 100644 --- a/net/irda/ircomm/ircomm_tty.c +++ b/net/irda/ircomm/ircomm_tty.c | |||
| @@ -379,12 +379,11 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp) | |||
| 379 | self = hashbin_lock_find(ircomm_tty, line, NULL); | 379 | self = hashbin_lock_find(ircomm_tty, line, NULL); |
| 380 | if (!self) { | 380 | if (!self) { |
| 381 | /* No, so make new instance */ | 381 | /* No, so make new instance */ |
| 382 | self = kmalloc(sizeof(struct ircomm_tty_cb), GFP_KERNEL); | 382 | self = kzalloc(sizeof(struct ircomm_tty_cb), GFP_KERNEL); |
| 383 | if (self == NULL) { | 383 | if (self == NULL) { |
| 384 | IRDA_ERROR("%s(), kmalloc failed!\n", __FUNCTION__); | 384 | IRDA_ERROR("%s(), kmalloc failed!\n", __FUNCTION__); |
| 385 | return -ENOMEM; | 385 | return -ENOMEM; |
| 386 | } | 386 | } |
| 387 | memset(self, 0, sizeof(struct ircomm_tty_cb)); | ||
| 388 | 387 | ||
| 389 | self->magic = IRCOMM_TTY_MAGIC; | 388 | self->magic = IRCOMM_TTY_MAGIC; |
| 390 | self->flow = FLOW_STOP; | 389 | self->flow = FLOW_STOP; |
| @@ -759,8 +758,9 @@ static int ircomm_tty_write(struct tty_struct *tty, | |||
| 759 | } | 758 | } |
| 760 | } else { | 759 | } else { |
| 761 | /* Prepare a full sized frame */ | 760 | /* Prepare a full sized frame */ |
| 762 | skb = dev_alloc_skb(self->max_data_size+ | 761 | skb = alloc_skb(self->max_data_size+ |
| 763 | self->max_header_size); | 762 | self->max_header_size, |
| 763 | GFP_ATOMIC); | ||
| 764 | if (!skb) { | 764 | if (!skb) { |
| 765 | spin_unlock_irqrestore(&self->spinlock, flags); | 765 | spin_unlock_irqrestore(&self->spinlock, flags); |
| 766 | return -ENOBUFS; | 766 | return -ENOBUFS; |