diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-13 12:06:52 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:25:15 -0400 |
commit | badff6d01a8589a1c828b0bf118903ca38627f4e (patch) | |
tree | 89611d7058c612085c58dfb9913ee30ddf04b604 /net/bluetooth/hci_core.c | |
parent | 0660e03f6b18f19b6bbafe7583265a51b90daf36 (diff) |
[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>
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r-- | net/bluetooth/hci_core.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 64fea0903fd7..c11ceb6b3f79 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
@@ -1074,11 +1074,11 @@ static void hci_add_acl_hdr(struct sk_buff *skb, __u16 handle, __u16 flags) | |||
1074 | struct hci_acl_hdr *hdr; | 1074 | struct hci_acl_hdr *hdr; |
1075 | int len = skb->len; | 1075 | int len = skb->len; |
1076 | 1076 | ||
1077 | hdr = (struct hci_acl_hdr *) skb_push(skb, HCI_ACL_HDR_SIZE); | 1077 | skb_push(skb, HCI_ACL_HDR_SIZE); |
1078 | skb_reset_transport_header(skb); | ||
1079 | hdr = (struct hci_acl_hdr *)skb->h.raw; | ||
1078 | hdr->handle = cpu_to_le16(hci_handle_pack(handle, flags)); | 1080 | hdr->handle = cpu_to_le16(hci_handle_pack(handle, flags)); |
1079 | hdr->dlen = cpu_to_le16(len); | 1081 | hdr->dlen = cpu_to_le16(len); |
1080 | |||
1081 | skb->h.raw = (void *) hdr; | ||
1082 | } | 1082 | } |
1083 | 1083 | ||
1084 | int hci_send_acl(struct hci_conn *conn, struct sk_buff *skb, __u16 flags) | 1084 | 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) | |||
1143 | hdr.handle = cpu_to_le16(conn->handle); | 1143 | hdr.handle = cpu_to_le16(conn->handle); |
1144 | hdr.dlen = skb->len; | 1144 | hdr.dlen = skb->len; |
1145 | 1145 | ||
1146 | skb->h.raw = skb_push(skb, HCI_SCO_HDR_SIZE); | 1146 | skb_push(skb, HCI_SCO_HDR_SIZE); |
1147 | skb_reset_transport_header(skb); | ||
1147 | memcpy(skb->h.raw, &hdr, HCI_SCO_HDR_SIZE); | 1148 | memcpy(skb->h.raw, &hdr, HCI_SCO_HDR_SIZE); |
1148 | 1149 | ||
1149 | skb->dev = (void *) hdev; | 1150 | skb->dev = (void *) hdev; |