diff options
Diffstat (limited to 'drivers/staging/ath6kl/os/linux/netbuf.c')
-rw-r--r-- | drivers/staging/ath6kl/os/linux/netbuf.c | 72 |
1 files changed, 35 insertions, 37 deletions
diff --git a/drivers/staging/ath6kl/os/linux/netbuf.c b/drivers/staging/ath6kl/os/linux/netbuf.c index 15e5d0475202..a9c96b315c48 100644 --- a/drivers/staging/ath6kl/os/linux/netbuf.c +++ b/drivers/staging/ath6kl/os/linux/netbuf.c @@ -63,8 +63,8 @@ a_netbuf_alloc(int size) { struct sk_buff *skb; size += 2 * (A_GET_CACHE_LINE_BYTES()); /* add some cacheline space at front and back of buffer */ - skb = dev_alloc_skb(AR6000_DATA_OFFSET + sizeof(HTC_PACKET) + size); - skb_reserve(skb, AR6000_DATA_OFFSET + sizeof(HTC_PACKET) + A_GET_CACHE_LINE_BYTES()); + skb = dev_alloc_skb(AR6000_DATA_OFFSET + sizeof(struct htc_packet) + size); + skb_reserve(skb, AR6000_DATA_OFFSET + sizeof(struct htc_packet) + A_GET_CACHE_LINE_BYTES()); return ((void *)skb); } @@ -89,8 +89,7 @@ a_netbuf_free(void *bufPtr) dev_kfree_skb(skb); } -A_UINT32 -a_netbuf_to_len(void *bufPtr) +u32 a_netbuf_to_len(void *bufPtr) { return (((struct sk_buff *)bufPtr)->len); } @@ -105,98 +104,97 @@ a_netbuf_to_data(void *bufPtr) * Add len # of bytes to the beginning of the network buffer * pointed to by bufPtr */ -A_STATUS -a_netbuf_push(void *bufPtr, A_INT32 len) +int +a_netbuf_push(void *bufPtr, s32 len) { skb_push((struct sk_buff *)bufPtr, len); - return A_OK; + return 0; } /* * Add len # of bytes to the beginning of the network buffer * pointed to by bufPtr and also fill with data */ -A_STATUS -a_netbuf_push_data(void *bufPtr, char *srcPtr, A_INT32 len) +int +a_netbuf_push_data(void *bufPtr, char *srcPtr, s32 len) { skb_push((struct sk_buff *) bufPtr, len); - A_MEMCPY(((struct sk_buff *)bufPtr)->data, srcPtr, len); + memcpy(((struct sk_buff *)bufPtr)->data, srcPtr, len); - return A_OK; + return 0; } /* * Add len # of bytes to the end of the network buffer * pointed to by bufPtr */ -A_STATUS -a_netbuf_put(void *bufPtr, A_INT32 len) +int +a_netbuf_put(void *bufPtr, s32 len) { skb_put((struct sk_buff *)bufPtr, len); - return A_OK; + return 0; } /* * Add len # of bytes to the end of the network buffer * pointed to by bufPtr and also fill with data */ -A_STATUS -a_netbuf_put_data(void *bufPtr, char *srcPtr, A_INT32 len) +int +a_netbuf_put_data(void *bufPtr, char *srcPtr, s32 len) { char *start = (char*)(((struct sk_buff *)bufPtr)->data + ((struct sk_buff *)bufPtr)->len); skb_put((struct sk_buff *)bufPtr, len); - A_MEMCPY(start, srcPtr, len); + memcpy(start, srcPtr, len); - return A_OK; + return 0; } /* * Trim the network buffer pointed to by bufPtr to len # of bytes */ -A_STATUS -a_netbuf_setlen(void *bufPtr, A_INT32 len) +int +a_netbuf_setlen(void *bufPtr, s32 len) { skb_trim((struct sk_buff *)bufPtr, len); - return A_OK; + return 0; } /* * Chop of len # of bytes from the end of the buffer. */ -A_STATUS -a_netbuf_trim(void *bufPtr, A_INT32 len) +int +a_netbuf_trim(void *bufPtr, s32 len) { skb_trim((struct sk_buff *)bufPtr, ((struct sk_buff *)bufPtr)->len - len); - return A_OK; + return 0; } /* * Chop of len # of bytes from the end of the buffer and return the data. */ -A_STATUS -a_netbuf_trim_data(void *bufPtr, char *dstPtr, A_INT32 len) +int +a_netbuf_trim_data(void *bufPtr, char *dstPtr, s32 len) { char *start = (char*)(((struct sk_buff *)bufPtr)->data + (((struct sk_buff *)bufPtr)->len - len)); - A_MEMCPY(dstPtr, start, len); + memcpy(dstPtr, start, len); skb_trim((struct sk_buff *)bufPtr, ((struct sk_buff *)bufPtr)->len - len); - return A_OK; + return 0; } /* * Returns the number of bytes available to a a_netbuf_push() */ -A_INT32 -a_netbuf_headroom(void *bufPtr) +s32 a_netbuf_headroom(void *bufPtr) { return (skb_headroom((struct sk_buff *)bufPtr)); } @@ -204,25 +202,25 @@ a_netbuf_headroom(void *bufPtr) /* * Removes specified number of bytes from the beginning of the buffer */ -A_STATUS -a_netbuf_pull(void *bufPtr, A_INT32 len) +int +a_netbuf_pull(void *bufPtr, s32 len) { skb_pull((struct sk_buff *)bufPtr, len); - return A_OK; + return 0; } /* * Removes specified number of bytes from the beginning of the buffer * and return the data */ -A_STATUS -a_netbuf_pull_data(void *bufPtr, char *dstPtr, A_INT32 len) +int +a_netbuf_pull_data(void *bufPtr, char *dstPtr, s32 len) { - A_MEMCPY(dstPtr, ((struct sk_buff *)bufPtr)->data, len); + memcpy(dstPtr, ((struct sk_buff *)bufPtr)->data, len); skb_pull((struct sk_buff *)bufPtr, len); - return A_OK; + return 0; } #ifdef EXPORT_HCI_BRIDGE_INTERFACE |