Bluetooth: 6lowpan: No need to clear memory twice

[PATCH] Bluetooth: 6lowpan: No need to clear memory twice

Christophe JAILLET posted 1 patch 4 years, 4 months ago

Download mbox

Failed in applying to current master (apply log)

net/bluetooth/6lowpan.c | 1 -
1 file changed, 1 deletion(-)

Expand all Fold all

[PATCH] Bluetooth: 6lowpan: No need to clear memory twice

Posted by Christophe JAILLET 4 years, 4 months ago

'peer_addr' is a structure embedded in 'struct lowpan_peer'. So there is no
need to explicitly call memset(0) on it. It is already zeroed by kzalloc()
when 'peer' is allocated.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 net/bluetooth/6lowpan.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
index 133d7ea063fb..8e8c07541153 100644
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
@@ -641,7 +641,6 @@ static struct l2cap_chan *add_peer_chan(struct l2cap_chan *chan,
 		return NULL;
 
 	peer->chan = chan;
-	memset(&peer->peer_addr, 0, sizeof(struct in6_addr));
 
 	baswap((void *)peer->lladdr, &chan->dst);
 
-- 
2.32.0

Re: [PATCH] Bluetooth: 6lowpan: No need to clear memory twice

Posted by Marcel Holtmann 4 years, 4 months ago

Hi Christophe,

> 'peer_addr' is a structure embedded in 'struct lowpan_peer'. So there is no
> need to explicitly call memset(0) on it. It is already zeroed by kzalloc()
> when 'peer' is allocated.
> 
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> net/bluetooth/6lowpan.c | 1 -
> 1 file changed, 1 deletion(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel