Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1485691 > unrolled thread
| Started by | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| First post | 2016-09-18 08:10 +0200 |
| Last post | 2016-09-18 08:30 +0200 |
| Articles | 11 — 1 participant |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 00/10] firewire-net: Fine-tuning for several function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:10 +0200
[PATCH 03/10] firewire-net: Rename jump labels in fwnet_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
[PATCH 04/10] firewire-net: Rename jump labels in fwnet_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
[PATCH 02/10] firewire-net: Rename a jump label in fwnet_broadcast_start() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
[PATCH 05/10] firewire-net: Rename a jump label in fwnet_tx() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
[PATCH 06/10] firewire-net: Rename a jump label in fwnet_send_packet() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
[PATCH 07/10] firewire-net: Rename a jump label in fwnet_incoming_packet() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
[PATCH 01/] firewire-net: Use kmalloc_array() in fwnet_broadcast_start() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
[PATCH 09/10] firewire-net: Rename jump labels in fwnet_pd_new() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:30 +0200
[PATCH 08/10] firewire-net: Rename a jump label in fwnet_finish_incoming_packet() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:30 +0200
[PATCH 10/10] firewire-net: Adjust checks for null pointers in five functions SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:30 +0200
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Date | 2016-09-18 08:10 +0200 |
| Subject | [PATCH 00/10] firewire-net: Fine-tuning for several function implementations |
| Message-ID | <siDsB-4oB-3@gated-at.bofh.it> |
From: Markus Elfring <elfring@users.sourceforge.net> Date: Sun, 18 Sep 2016 08:04:02 +0200 Some update suggestions were taken into account from static source code analysis. Markus Elfring (10): Use kmalloc_array() in fwnet_broadcast_start() Rename a jump label in fwnet_broadcast_start() Rename jump labels in fwnet_init() Rename jump labels in fwnet_probe() Rename a jump label in fwnet_tx() Rename a jump label in fwnet_send_packet() Rename a jump label in fwnet_incoming_packet() Rename a jump label in fwnet_finish_incoming_packet() Rename jump labels in fwnet_pd_new() Adjust checks for null pointers in five functions drivers/firewire/net.c | 94 +++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 50 deletions(-) -- 2.10.0
[toc] | [next] | [standalone]
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Date | 2016-09-18 08:20 +0200 |
| Subject | [PATCH 03/10] firewire-net: Rename jump labels in fwnet_init() |
| Message-ID | <siDCh-4sb-3@gated-at.bofh.it> |
| In reply to | #1485691 |
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 17 Sep 2016 22:11:25 +0200
Adjust jump labels according to the current Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/firewire/net.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 89afed3..cedfade 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -1662,14 +1662,14 @@ static int __init fwnet_init(void)
#if IS_ENABLED(CONFIG_IPV6)
err = fw_core_add_descriptor(&rfc3146_unit_directory);
if (err)
- goto out;
+ goto remove_descriptor_rfc2374;
#endif
fwnet_packet_task_cache = kmem_cache_create("packet_task",
sizeof(struct fwnet_packet_task), 0, 0, NULL);
if (!fwnet_packet_task_cache) {
err = -ENOMEM;
- goto out2;
+ goto remove_descriptor_rfc3146;
}
err = driver_register(&fwnet_driver.driver);
@@ -1677,10 +1677,10 @@ static int __init fwnet_init(void)
return 0;
kmem_cache_destroy(fwnet_packet_task_cache);
-out2:
+ remove_descriptor_rfc3146:
#if IS_ENABLED(CONFIG_IPV6)
fw_core_remove_descriptor(&rfc3146_unit_directory);
-out:
+ remove_descriptor_rfc2374:
#endif
fw_core_remove_descriptor(&rfc2374_unit_directory);
--
2.10.0
[toc] | [prev] | [next] | [standalone]
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Date | 2016-09-18 08:20 +0200 |
| Subject | [PATCH 04/10] firewire-net: Rename jump labels in fwnet_probe() |
| Message-ID | <siDCh-4sb-9@gated-at.bofh.it> |
| In reply to | #1485691 |
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 17 Sep 2016 22:17:12 +0200
Adjust jump labels according to the current Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/firewire/net.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index cedfade..2ca2d57 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -1442,7 +1442,7 @@ static int fwnet_probe(struct fw_unit *unit,
dev = fwnet_dev_find(card);
if (dev) {
net = dev->netdev;
- goto have_dev;
+ goto add_peer;
}
net = alloc_netdev(sizeof(*dev), "firewire%d", NET_NAME_UNKNOWN,
@@ -1469,7 +1469,7 @@ static int fwnet_probe(struct fw_unit *unit,
ret = fwnet_fifo_start(dev);
if (ret < 0)
- goto out;
+ goto stop_fifo;
dev->local_fifo = dev->handler.offset;
/*
@@ -1492,17 +1492,17 @@ static int fwnet_probe(struct fw_unit *unit,
ret = register_netdev(net);
if (ret)
- goto out;
+ goto stop_fifo;
list_add_tail(&dev->dev_link, &fwnet_device_list);
dev_notice(&net->dev, "IP over IEEE 1394 on card %s\n",
dev_name(card->device));
- have_dev:
+ add_peer:
ret = fwnet_add_peer(dev, unit, device);
if (ret && allocated_netdev) {
unregister_netdev(net);
list_del(&dev->dev_link);
- out:
+ stop_fifo:
fwnet_fifo_stop(dev);
free_netdev(net);
}
--
2.10.0
[toc] | [prev] | [next] | [standalone]
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Date | 2016-09-18 08:20 +0200 |
| Subject | [PATCH 02/10] firewire-net: Rename a jump label in fwnet_broadcast_start() |
| Message-ID | <siDCh-4sb-5@gated-at.bofh.it> |
| In reply to | #1485691 |
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 17 Sep 2016 22:02:44 +0200
Adjust jump labels according to the current Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/firewire/net.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 7911f13..89afed3 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -1106,7 +1106,7 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
ptrptr = kmalloc_array(num_packets, sizeof(*ptrptr), GFP_KERNEL);
if (!ptrptr) {
retval = -ENOMEM;
- goto failed;
+ goto stop_broadcast;
}
dev->broadcast_rcv_buffer_ptrs = ptrptr;
@@ -1116,13 +1116,13 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
fwnet_receive_broadcast, dev);
if (IS_ERR(context)) {
retval = PTR_ERR(context);
- goto failed;
+ goto stop_broadcast;
}
retval = fw_iso_buffer_init(&dev->broadcast_rcv_buffer, dev->card,
FWNET_ISO_PAGE_COUNT, DMA_FROM_DEVICE);
if (retval < 0)
- goto failed;
+ goto stop_broadcast;
dev->broadcast_state = FWNET_BROADCAST_STOPPED;
@@ -1148,7 +1148,7 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
retval = fw_iso_context_queue(context, &packet,
&dev->broadcast_rcv_buffer, offset);
if (retval < 0)
- goto failed;
+ goto stop_broadcast;
offset += max_receive;
}
@@ -1158,7 +1158,7 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
retval = fw_iso_context_start(context, -1, 0,
FW_ISO_CONTEXT_MATCH_ALL_TAGS); /* ??? sync */
if (retval < 0)
- goto failed;
+ goto stop_broadcast;
/* FIXME: adjust it according to the min. speed of all known peers? */
dev->broadcast_xmt_max_payload = IEEE1394_MAX_PAYLOAD_S100
@@ -1166,8 +1166,7 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
dev->broadcast_state = FWNET_BROADCAST_RUNNING;
return 0;
-
- failed:
+ stop_broadcast:
__fwnet_broadcast_stop(dev);
return retval;
}
--
2.10.0
[toc] | [prev] | [next] | [standalone]
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Date | 2016-09-18 08:20 +0200 |
| Subject | [PATCH 05/10] firewire-net: Rename a jump label in fwnet_tx() |
| Message-ID | <siDCh-4sb-7@gated-at.bofh.it> |
| In reply to | #1485691 |
From: Markus Elfring <elfring@users.sourceforge.net> Date: Sat, 17 Sep 2016 22:22:58 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> --- drivers/firewire/net.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index 2ca2d57..24725be 100644 --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c @@ -1233,11 +1233,11 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net) ptask = kmem_cache_alloc(fwnet_packet_task_cache, GFP_ATOMIC); if (ptask == NULL) - goto fail; + goto unlock; skb = skb_share_check(skb, GFP_ATOMIC); if (!skb) - goto fail; + goto unlock; /* * Make a copy of the driver-specific header. @@ -1254,7 +1254,7 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net) #endif break; default: - goto fail; + goto unlock; } skb_pull(skb, sizeof(hdr_buf)); @@ -1279,7 +1279,7 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net) peer = fwnet_peer_find_by_guid(dev, be64_to_cpu(guid)); if (!peer) - goto fail; + goto unlock; generation = peer->generation; dest_node = peer->node_id; @@ -1324,8 +1324,7 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net) fwnet_send_packet(ptask); return NETDEV_TX_OK; - - fail: + unlock: spin_unlock_irqrestore(&dev->lock, flags); if (ptask) -- 2.10.0
[toc] | [prev] | [next] | [standalone]
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Date | 2016-09-18 08:20 +0200 |
| Subject | [PATCH 06/10] firewire-net: Rename a jump label in fwnet_send_packet() |
| Message-ID | <siDCh-4sb-13@gated-at.bofh.it> |
| In reply to | #1485691 |
From: Markus Elfring <elfring@users.sourceforge.net> Date: Sat, 17 Sep 2016 22:27:52 +0200 Adjust a jump label according to the current Linux coding style convention. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> --- drivers/firewire/net.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index 24725be..a0ccab3 100644 --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c @@ -1003,8 +1003,7 @@ static int fwnet_send_packet(struct fwnet_packet_task *ptask) dec_queued_datagrams(dev); spin_unlock_irqrestore(&dev->lock, flags); - - goto out; + goto check_free; } fw_send_request(dev->card, &ptask->transaction, @@ -1024,7 +1023,7 @@ static int fwnet_send_packet(struct fwnet_packet_task *ptask) spin_unlock_irqrestore(&dev->lock, flags); netif_trans_update(dev->netdev); - out: + check_free: if (free) fwnet_free_ptask(ptask); -- 2.10.0
[toc] | [prev] | [next] | [standalone]
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Date | 2016-09-18 08:20 +0200 |
| Subject | [PATCH 07/10] firewire-net: Rename a jump label in fwnet_incoming_packet() |
| Message-ID | <siDCh-4sb-15@gated-at.bofh.it> |
| In reply to | #1485691 |
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 17 Sep 2016 22:32:14 +0200
Adjust jump labels according to the current Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/firewire/net.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index a0ccab3..7e802e7 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -621,7 +621,7 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
peer = fwnet_peer_find_by_node_id(dev, source_node_id, generation);
if (!peer) {
retval = -ENOENT;
- goto fail;
+ goto unlock;
}
pd = fwnet_pd_find(peer, datagram_label);
@@ -636,7 +636,7 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
dg_size, buf, fg_off, len);
if (pd == NULL) {
retval = -ENOMEM;
- goto fail;
+ goto unlock;
}
peer->pdg_size++;
} else {
@@ -652,7 +652,7 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
if (pd == NULL) {
peer->pdg_size--;
retval = -ENOMEM;
- goto fail;
+ goto unlock;
}
} else {
if (!fwnet_pd_update(peer, pd, buf, fg_off, len)) {
@@ -664,7 +664,7 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
fwnet_pd_delete(pd);
peer->pdg_size--;
retval = -ENOMEM;
- goto fail;
+ goto unlock;
}
}
} /* new datagram or add to existing one */
@@ -688,7 +688,7 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
* moment.
*/
retval = 0;
- fail:
+ unlock:
spin_unlock_irqrestore(&dev->lock, flags);
return retval;
--
2.10.0
[toc] | [prev] | [next] | [standalone]
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Date | 2016-09-18 08:20 +0200 |
| Subject | [PATCH 01/] firewire-net: Use kmalloc_array() in fwnet_broadcast_start() |
| Message-ID | <siDCh-4sb-11@gated-at.bofh.it> |
| In reply to | #1485691 |
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 17 Sep 2016 21:55:42 +0200
* A multiplication for the size determination of a memory allocation
indicated that an array data structure should be processed.
Thus use the corresponding function "kmalloc_array".
This issue was detected by using the Coccinelle software.
* Replace the specification of a data type by a pointer dereference
to make the corresponding size determination a bit safer according to
the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/firewire/net.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 309311b..7911f13 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -1103,8 +1103,7 @@ static int fwnet_broadcast_start(struct fwnet_device *dev)
max_receive = 1U << (dev->card->max_receive + 1);
num_packets = (FWNET_ISO_PAGE_COUNT * PAGE_SIZE) / max_receive;
-
- ptrptr = kmalloc(sizeof(void *) * num_packets, GFP_KERNEL);
+ ptrptr = kmalloc_array(num_packets, sizeof(*ptrptr), GFP_KERNEL);
if (!ptrptr) {
retval = -ENOMEM;
goto failed;
--
2.10.0
[toc] | [prev] | [next] | [standalone]
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Date | 2016-09-18 08:30 +0200 |
| Subject | [PATCH 09/10] firewire-net: Rename jump labels in fwnet_pd_new() |
| Message-ID | <siDLX-4vi-1@gated-at.bofh.it> |
| In reply to | #1485691 |
From: Markus Elfring <elfring@users.sourceforge.net> Date: Sat, 17 Sep 2016 22:48:46 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> --- drivers/firewire/net.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index 6dd3174..eb7ce5e 100644 --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c @@ -362,18 +362,18 @@ static struct fwnet_partial_datagram *fwnet_pd_new(struct net_device *net, new = kmalloc(sizeof(*new), GFP_ATOMIC); if (!new) - goto fail; + goto exit; INIT_LIST_HEAD(&new->fi_list); fi = fwnet_frag_new(new, frag_off, frag_len); if (fi == NULL) - goto fail_w_new; + goto free_new; new->datagram_label = datagram_label; new->datagram_size = dg_size; new->skb = dev_alloc_skb(dg_size + LL_RESERVED_SPACE(net)); if (new->skb == NULL) - goto fail_w_fi; + goto free_fragment_info; skb_reserve(new->skb, LL_RESERVED_SPACE(net)); new->pbuf = skb_put(new->skb, dg_size); @@ -381,12 +381,11 @@ static struct fwnet_partial_datagram *fwnet_pd_new(struct net_device *net, list_add_tail(&new->pd_link, &peer->pd_list); return new; - -fail_w_fi: + free_fragment_info: kfree(fi); -fail_w_new: + free_new: kfree(new); -fail: + exit: return NULL; } -- 2.10.0
[toc] | [prev] | [next] | [standalone]
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Date | 2016-09-18 08:30 +0200 |
| Subject | [PATCH 08/10] firewire-net: Rename a jump label in fwnet_finish_incoming_packet() |
| Message-ID | <siDLX-4vi-3@gated-at.bofh.it> |
| In reply to | #1485691 |
From: Markus Elfring <elfring@users.sourceforge.net> Date: Sat, 17 Sep 2016 22:40:05 +0200 Adjust a jump label according to the current Linux coding style convention. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> --- drivers/firewire/net.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index 7e802e7..6dd3174 100644 --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c @@ -495,7 +495,7 @@ static int fwnet_finish_incoming_packet(struct net_device *net, #endif break; default: - goto err; + goto increment_counter; } dev = netdev_priv(net); @@ -551,8 +551,7 @@ static int fwnet_finish_incoming_packet(struct net_device *net, } return 0; - - err: + increment_counter: net->stats.rx_errors++; net->stats.rx_dropped++; -- 2.10.0
[toc] | [prev] | [next] | [standalone]
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Date | 2016-09-18 08:30 +0200 |
| Subject | [PATCH 10/10] firewire-net: Adjust checks for null pointers in five functions |
| Message-ID | <siDLX-4vi-7@gated-at.bofh.it> |
| In reply to | #1485691 |
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 18 Sep 2016 07:48:56 +0200
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The script "checkpatch.pl" can point information out like the following.
Comparison to NULL could be written !…
Thus fix the affected source code places.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/firewire/net.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index eb7ce5e..e313be3 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -366,13 +366,13 @@ static struct fwnet_partial_datagram *fwnet_pd_new(struct net_device *net,
INIT_LIST_HEAD(&new->fi_list);
fi = fwnet_frag_new(new, frag_off, frag_len);
- if (fi == NULL)
+ if (!fi)
goto free_new;
new->datagram_label = datagram_label;
new->datagram_size = dg_size;
new->skb = dev_alloc_skb(dg_size + LL_RESERVED_SPACE(net));
- if (new->skb == NULL)
+ if (!new->skb)
goto free_fragment_info;
skb_reserve(new->skb, LL_RESERVED_SPACE(net));
@@ -418,7 +418,7 @@ static bool fwnet_pd_update(struct fwnet_peer *peer,
struct fwnet_partial_datagram *pd, void *frag_buf,
unsigned frag_off, unsigned frag_len)
{
- if (fwnet_frag_new(pd, frag_off, frag_len) == NULL)
+ if (!fwnet_frag_new(pd, frag_off, frag_len))
return false;
memcpy(pd->pbuf + frag_off, frag_buf, frag_len);
@@ -623,7 +623,7 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
}
pd = fwnet_pd_find(peer, datagram_label);
- if (pd == NULL) {
+ if (!pd) {
while (peer->pdg_size >= FWNET_MAX_FRAGMENTS) {
/* remove the oldest */
fwnet_pd_delete(list_first_entry(&peer->pd_list,
@@ -632,7 +632,7 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
}
pd = fwnet_pd_new(net, peer, datagram_label,
dg_size, buf, fg_off, len);
- if (pd == NULL) {
+ if (!pd) {
retval = -ENOMEM;
goto unlock;
}
@@ -647,7 +647,7 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
fwnet_pd_delete(pd);
pd = fwnet_pd_new(net, peer, datagram_label,
dg_size, buf, fg_off, len);
- if (pd == NULL) {
+ if (!pd) {
peer->pdg_size--;
retval = -ENOMEM;
goto unlock;
@@ -1229,7 +1229,7 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net)
}
ptask = kmem_cache_alloc(fwnet_packet_task_cache, GFP_ATOMIC);
- if (ptask == NULL)
+ if (!ptask)
goto unlock;
skb = skb_share_check(skb, GFP_ATOMIC);
@@ -1443,7 +1443,7 @@ static int fwnet_probe(struct fw_unit *unit,
net = alloc_netdev(sizeof(*dev), "firewire%d", NET_NAME_UNKNOWN,
fwnet_init_dev);
- if (net == NULL) {
+ if (!net) {
mutex_unlock(&fwnet_device_mutex);
return -ENOMEM;
}
--
2.10.0
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web