diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-25 21:04:18 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:25:31 -0400 |
| commit | 9c70220b73908f64792422a2c39c593c4792f2c5 (patch) | |
| tree | 2090ea10aaa2714a5e095bae8cc02e743c378a3a /net/bluetooth | |
| parent | a27ef749e7be3b06fb58df53d94eb97a21f18707 (diff) | |
[SK_BUFF]: Introduce skb_transport_header(skb)
For the places where we need a pointer to the transport header, it is
still legal to touch skb->h.raw directly if just adding to,
subtracting from or setting it to another layer header.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/hci_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index c11ceb6b3f79..c177e75d64a6 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
| @@ -1076,7 +1076,7 @@ static void hci_add_acl_hdr(struct sk_buff *skb, __u16 handle, __u16 flags) | |||
| 1076 | 1076 | ||
| 1077 | skb_push(skb, HCI_ACL_HDR_SIZE); | 1077 | skb_push(skb, HCI_ACL_HDR_SIZE); |
| 1078 | skb_reset_transport_header(skb); | 1078 | skb_reset_transport_header(skb); |
| 1079 | hdr = (struct hci_acl_hdr *)skb->h.raw; | 1079 | hdr = (struct hci_acl_hdr *)skb_transport_header(skb); |
| 1080 | hdr->handle = cpu_to_le16(hci_handle_pack(handle, flags)); | 1080 | hdr->handle = cpu_to_le16(hci_handle_pack(handle, flags)); |
| 1081 | hdr->dlen = cpu_to_le16(len); | 1081 | hdr->dlen = cpu_to_le16(len); |
| 1082 | } | 1082 | } |
| @@ -1145,7 +1145,7 @@ int hci_send_sco(struct hci_conn *conn, struct sk_buff *skb) | |||
| 1145 | 1145 | ||
| 1146 | skb_push(skb, HCI_SCO_HDR_SIZE); | 1146 | skb_push(skb, HCI_SCO_HDR_SIZE); |
| 1147 | skb_reset_transport_header(skb); | 1147 | skb_reset_transport_header(skb); |
| 1148 | memcpy(skb->h.raw, &hdr, HCI_SCO_HDR_SIZE); | 1148 | memcpy(skb_transport_header(skb), &hdr, HCI_SCO_HDR_SIZE); |
| 1149 | 1149 | ||
| 1150 | skb->dev = (void *) hdev; | 1150 | skb->dev = (void *) hdev; |
| 1151 | bt_cb(skb)->pkt_type = HCI_SCODATA_PKT; | 1151 | bt_cb(skb)->pkt_type = HCI_SCODATA_PKT; |
