Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f6cd79f authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Remove src and dst fields from bt_sock structure 



Every socket protocol now stores its own address information. So
just remove the generic src and dst fields since they are no longer
needed.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 94a86df0

include/net/bluetooth/bluetooth.h

+0 −2
Original line number Diff line number Diff line
@@ -218,8 +218,6 @@ void baswap(bdaddr_t *dst, bdaddr_t *src); 


struct bt_sock {

	struct sock sk;

	bdaddr_t    src;

	bdaddr_t    dst;

	struct list_head accept_q;

	struct sock *parent;

	unsigned long flags;

net/bluetooth/af_bluetooth.c

+1 −3
Original line number Diff line number Diff line
@@ -617,15 +617,13 @@ static int bt_seq_show(struct seq_file *seq, void *v) 
		struct bt_sock *bt = bt_sk(sk);



		seq_printf(seq,

			   "%pK %-6d %-6u %-6u %-6u %-6lu %pMR %pMR %-6lu",

			   "%pK %-6d %-6u %-6u %-6u %-6lu %-6lu",

			   sk,

			   atomic_read(&sk->sk_refcnt),

			   sk_rmem_alloc_get(sk),

			   sk_wmem_alloc_get(sk),

			   from_kuid(seq_user_ns(seq), sock_i_uid(sk)),

			   sock_i_ino(sk),

			   &bt->src,

			   &bt->dst,

			   bt->parent? sock_i_ino(bt->parent): 0LU);



		if (l->custom_seq_show) {