* [PATCH] 6lowpan: set peer_addr correctly again
@ 2017-03-28 13:29 Arnd Bergmann
2017-03-28 13:37 ` Marcel Holtmann
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2017-03-28 13:29 UTC (permalink / raw)
To: Marcel Holtmann, Gustavo Padovan, Johan Hedberg
Cc: Arnd Bergmann, David S. Miller, Stefan Schmidt, Jukka Rissanen,
Luiz Augusto von Dentz, Eric Dumazet, Patrik Flykt,
Alexander Aring, Glenn Ruben Bakke, linux-bluetooth, netdev,
linux-kernel
A bugfix accidentally changed one line to return the peer_addr
from setup_header, causing it to become unused:
net/bluetooth/6lowpan.c: In function 'setup_header':
net/bluetooth/6lowpan.c:402:14: error: parameter 'peer_addr' set but not used [-Werror=unused-but-set-parameter]
The only user of the variable is a subsequent printk(), and
it is not otherwise initialized, so reverting the changed line
looks like the right fix.
Fixes: fb6f2f606ce8 ("6lowpan: Fix IID format for Bluetooth")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
net/bluetooth/6lowpan.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
index 24348c8579dd..ba28c7b1557f 100644
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
@@ -432,7 +432,7 @@ static int setup_header(struct sk_buff *skb, struct net_device *netdev,
}
daddr = peer->lladdr;
- peer_addr = &peer->chan->dst;
+ *peer_addr = peer->chan->dst;
*peer_addr_type = peer->chan->dst_type;
lowpan_cb(skb)->chan = peer->chan;
--
2.9.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] 6lowpan: set peer_addr correctly again
2017-03-28 13:29 [PATCH] 6lowpan: set peer_addr correctly again Arnd Bergmann
@ 2017-03-28 13:37 ` Marcel Holtmann
2017-03-28 13:42 ` Von Dentz, Luiz
0 siblings, 1 reply; 3+ messages in thread
From: Marcel Holtmann @ 2017-03-28 13:37 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Gustavo F. Padovan, Johan Hedberg, David S. Miller,
Stefan Schmidt, Jukka Rissanen, Luiz Augusto von Dentz,
Eric Dumazet, Patrik Flykt, Alexander Aring, Glenn Ruben Bakke,
linux-bluetooth, netdev, linux-kernel
Hi Arnd,
> A bugfix accidentally changed one line to return the peer_addr
> from setup_header, causing it to become unused:
>
> net/bluetooth/6lowpan.c: In function 'setup_header':
> net/bluetooth/6lowpan.c:402:14: error: parameter 'peer_addr' set but not used [-Werror=unused-but-set-parameter]
>
> The only user of the variable is a subsequent printk(), and
> it is not otherwise initialized, so reverting the changed line
> looks like the right fix.
>
> Fixes: fb6f2f606ce8 ("6lowpan: Fix IID format for Bluetooth")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> net/bluetooth/6lowpan.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
I took Colin’s patch since it showed up first in my inbox.
Regards
Marcel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] 6lowpan: set peer_addr correctly again
2017-03-28 13:37 ` Marcel Holtmann
@ 2017-03-28 13:42 ` Von Dentz, Luiz
0 siblings, 0 replies; 3+ messages in thread
From: Von Dentz, Luiz @ 2017-03-28 13:42 UTC (permalink / raw)
To: Marcel Holtmann
Cc: Arnd Bergmann, Gustavo F. Padovan, Johan Hedberg, David S. Miller,
Stefan Schmidt, Jukka Rissanen, Eric Dumazet, Patrik Flykt,
Alexander Aring, Glenn Ruben Bakke,
linux-bluetooth@vger.kernel.org, netdev, linux-kernel
Hi Marcel,
On Tue, Mar 28, 2017 at 4:37 PM, Marcel Holtmann <marcel@holtmann.org> wrote:
> Hi Arnd,
>
>> A bugfix accidentally changed one line to return the peer_addr
>> from setup_header, causing it to become unused:
>>
>> net/bluetooth/6lowpan.c: In function 'setup_header':
>> net/bluetooth/6lowpan.c:402:14: error: parameter 'peer_addr' set but not used [-Werror=unused-but-set-parameter]
>>
>> The only user of the variable is a subsequent printk(), and
>> it is not otherwise initialized, so reverting the changed line
>> looks like the right fix.
>>
>> Fixes: fb6f2f606ce8 ("6lowpan: Fix IID format for Bluetooth")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> ---
>> net/bluetooth/6lowpan.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> I took Colin’s patch since it showed up first in my inbox.
Thanks, I might be missing something since the error doesn't show up for me:
CC [M] net/bluetooth/6lowpan.o
LD [M] net/bluetooth/bluetooth_6lowpan.o
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-03-28 13:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-28 13:29 [PATCH] 6lowpan: set peer_addr correctly again Arnd Bergmann
2017-03-28 13:37 ` Marcel Holtmann
2017-03-28 13:42 ` Von Dentz, Luiz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox