[SK_BUFF]: Introduce skb_reset_transport_header(skb)
For the common, open coded 'skb->h.raw = skb->data' operation, so that we can later turn skb->h.raw into a offset, reducing the size of struct sk_buff in 64bit land while possibly keeping it as a pointer on 32bit. This one touches just the most simple cases: skb->h.raw = skb->data; skb->h.raw = {skb_push|[__]skb_pull}() The next ones will handle the slightly more "complex" cases. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
0660e03f6b
commit
badff6d01a
@ -221,7 +221,7 @@ int bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
|
||||
copied = len;
|
||||
}
|
||||
|
||||
skb->h.raw = skb->data;
|
||||
skb_reset_transport_header(skb);
|
||||
err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
|
||||
|
||||
skb_free_datagram(sk, skb);
|
||||
|
@ -1074,11 +1074,11 @@ static void hci_add_acl_hdr(struct sk_buff *skb, __u16 handle, __u16 flags)
|
||||
struct hci_acl_hdr *hdr;
|
||||
int len = skb->len;
|
||||
|
||||
hdr = (struct hci_acl_hdr *) skb_push(skb, HCI_ACL_HDR_SIZE);
|
||||
skb_push(skb, HCI_ACL_HDR_SIZE);
|
||||
skb_reset_transport_header(skb);
|
||||
hdr = (struct hci_acl_hdr *)skb->h.raw;
|
||||
hdr->handle = cpu_to_le16(hci_handle_pack(handle, flags));
|
||||
hdr->dlen = cpu_to_le16(len);
|
||||
|
||||
skb->h.raw = (void *) hdr;
|
||||
}
|
||||
|
||||
int hci_send_acl(struct hci_conn *conn, struct sk_buff *skb, __u16 flags)
|
||||
@ -1143,7 +1143,8 @@ int hci_send_sco(struct hci_conn *conn, struct sk_buff *skb)
|
||||
hdr.handle = cpu_to_le16(conn->handle);
|
||||
hdr.dlen = skb->len;
|
||||
|
||||
skb->h.raw = skb_push(skb, HCI_SCO_HDR_SIZE);
|
||||
skb_push(skb, HCI_SCO_HDR_SIZE);
|
||||
skb_reset_transport_header(skb);
|
||||
memcpy(skb->h.raw, &hdr, HCI_SCO_HDR_SIZE);
|
||||
|
||||
skb->dev = (void *) hdev;
|
||||
|
@ -375,7 +375,7 @@ static int hci_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
|
||||
copied = len;
|
||||
}
|
||||
|
||||
skb->h.raw = skb->data;
|
||||
skb_reset_transport_header(skb);
|
||||
err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
|
||||
|
||||
hci_sock_cmsg(sk, msg, skb);
|
||||
|
Reference in New Issue
Block a user