mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2025-01-18 10:56:12 +07:00
Bluetooth: Remove err parameter from alloc_skb()
Use ERR_PTR maginc instead. Signed-off-by: Gustavo Padovan <gustavo@padovan.org> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
parent
bd4b165312
commit
9033894722
@ -519,7 +519,7 @@ struct l2cap_ops {
|
||||
void (*close) (void *data);
|
||||
void (*state_change) (void *data, int state);
|
||||
struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
|
||||
unsigned long len, int nb, int *err);
|
||||
unsigned long len, int nb);
|
||||
|
||||
};
|
||||
|
||||
|
@ -1563,7 +1563,7 @@ static inline int l2cap_skbuff_fromiovec(struct l2cap_chan *chan,
|
||||
{
|
||||
struct l2cap_conn *conn = chan->conn;
|
||||
struct sk_buff **frag;
|
||||
int err, sent = 0;
|
||||
int sent = 0;
|
||||
|
||||
if (memcpy_fromiovec(skb_put(skb, count), msg->msg_iov, count))
|
||||
return -EFAULT;
|
||||
@ -1577,11 +1577,10 @@ static inline int l2cap_skbuff_fromiovec(struct l2cap_chan *chan,
|
||||
count = min_t(unsigned int, conn->mtu, len);
|
||||
|
||||
*frag = chan->ops->alloc_skb(chan, count,
|
||||
msg->msg_flags & MSG_DONTWAIT,
|
||||
&err);
|
||||
msg->msg_flags & MSG_DONTWAIT);
|
||||
|
||||
if (!*frag)
|
||||
return err;
|
||||
if (IS_ERR(*frag))
|
||||
return PTR_ERR(*frag);
|
||||
if (memcpy_fromiovec(skb_put(*frag, count), msg->msg_iov, count))
|
||||
return -EFAULT;
|
||||
|
||||
@ -1610,10 +1609,9 @@ static struct sk_buff *l2cap_create_connless_pdu(struct l2cap_chan *chan,
|
||||
count = min_t(unsigned int, (conn->mtu - hlen), len);
|
||||
|
||||
skb = chan->ops->alloc_skb(chan, count + hlen,
|
||||
msg->msg_flags & MSG_DONTWAIT, &err);
|
||||
|
||||
if (!skb)
|
||||
return ERR_PTR(err);
|
||||
msg->msg_flags & MSG_DONTWAIT);
|
||||
if (IS_ERR(skb))
|
||||
return skb;
|
||||
|
||||
skb->priority = priority;
|
||||
|
||||
@ -1645,10 +1643,9 @@ static struct sk_buff *l2cap_create_basic_pdu(struct l2cap_chan *chan,
|
||||
count = min_t(unsigned int, (conn->mtu - hlen), len);
|
||||
|
||||
skb = chan->ops->alloc_skb(chan, count + hlen,
|
||||
msg->msg_flags & MSG_DONTWAIT, &err);
|
||||
|
||||
if (!skb)
|
||||
return ERR_PTR(err);
|
||||
msg->msg_flags & MSG_DONTWAIT);
|
||||
if (IS_ERR(skb))
|
||||
return skb;
|
||||
|
||||
skb->priority = priority;
|
||||
|
||||
@ -1693,10 +1690,9 @@ static struct sk_buff *l2cap_create_iframe_pdu(struct l2cap_chan *chan,
|
||||
count = min_t(unsigned int, (conn->mtu - hlen), len);
|
||||
|
||||
skb = chan->ops->alloc_skb(chan, count + hlen,
|
||||
msg->msg_flags & MSG_DONTWAIT, &err);
|
||||
|
||||
if (!skb)
|
||||
return ERR_PTR(err);
|
||||
msg->msg_flags & MSG_DONTWAIT);
|
||||
if (IS_ERR(skb))
|
||||
return skb;
|
||||
|
||||
/* Create L2CAP header */
|
||||
lh = (struct l2cap_hdr *) skb_put(skb, L2CAP_HDR_SIZE);
|
||||
|
@ -927,12 +927,16 @@ static void l2cap_sock_state_change_cb(void *data, int state)
|
||||
}
|
||||
|
||||
static struct sk_buff *l2cap_sock_alloc_skb_cb(struct l2cap_chan *chan,
|
||||
unsigned long len, int nb,
|
||||
int *err)
|
||||
unsigned long len, int nb)
|
||||
{
|
||||
struct sock *sk = chan->sk;
|
||||
struct sk_buff *skb;
|
||||
int err;
|
||||
|
||||
return bt_skb_send_alloc(sk, len, nb, err);
|
||||
skb = bt_skb_send_alloc(chan->sk, len, nb, &err);
|
||||
if (!skb)
|
||||
return ERR_PTR(err);
|
||||
|
||||
return skb;
|
||||
}
|
||||
|
||||
static struct l2cap_ops l2cap_chan_ops = {
|
||||
|
Loading…
Reference in New Issue
Block a user