Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363361
b: refs/heads/master
c: 3009891
h: refs/heads/master
i:
  363359: 5d98929
v: v3
  • Loading branch information
Niklas Söderlund authored and Greg Kroah-Hartman committed Mar 11, 2013
1 parent fcb14f9 commit bca7a3f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 75 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f1d07f33321d10d92ab74fdab0340c1f14c106a4
refs/heads/master: 3009891c9f19d4e9d75941f7400656782e452baf
74 changes: 0 additions & 74 deletions trunk/drivers/staging/rtl8712/rtl871x_recv.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,6 @@ static inline u8 *get_rxmem(union recv_frame *precvframe)
return precvframe->u.hdr.rx_head;
}

static inline u8 *get_rx_status(union recv_frame *precvframe)
{
return get_rxmem(precvframe);
}

static inline u8 *get_recvframe_data(union recv_frame *precvframe)
{
/* always return rx_data */
Expand All @@ -163,28 +158,6 @@ static inline u8 *get_recvframe_data(union recv_frame *precvframe)
return precvframe->u.hdr.rx_data;
}

static inline u8 *recvframe_push(union recv_frame *precvframe, sint sz)
{
/* append data before rx_data */

/* add data to the start of recv_frame
*
* This function extends the used data area of the recv_frame at the
* buffer start. rx_data must be still larger than rx_head, after
* pushing.
*/

if (precvframe == NULL)
return NULL;
precvframe->u.hdr.rx_data -= sz ;
if (precvframe->u.hdr.rx_data < precvframe->u.hdr.rx_head) {
precvframe->u.hdr.rx_data += sz ;
return NULL;
}
precvframe->u.hdr.len += sz;
return precvframe->u.hdr.rx_data;
}

static inline u8 *recvframe_pull(union recv_frame *precvframe, sint sz)
{
/* used for extract sz bytes from rx_data, update rx_data and return
Expand Down Expand Up @@ -236,53 +209,6 @@ static inline u8 *recvframe_pull_tail(union recv_frame *precvframe, sint sz)
return precvframe->u.hdr.rx_tail;
}

static inline _buffer *get_rxbuf_desc(union recv_frame *precvframe)
{
_buffer *buf_desc;
if (precvframe == NULL)
return NULL;
return buf_desc;
}

static inline union recv_frame *rxmem_to_recvframe(u8 *rxmem)
{
/* due to the design of 2048 bytes alignment of recv_frame, we can
* reference the union recv_frame from any given member of recv_frame.
* rxmem indicates the any member/address in recv_frame */
return (union recv_frame *)(((addr_t)rxmem >> RXFRAME_ALIGN) <<
RXFRAME_ALIGN);
}

static inline union recv_frame *pkt_to_recvframe(_pkt *pkt)
{
u8 *buf_star;
union recv_frame *precv_frame;

precv_frame = rxmem_to_recvframe((unsigned char *)buf_star);
return precv_frame;
}

static inline u8 *pkt_to_recvmem(_pkt *pkt)
{
/* return the rx_head */
union recv_frame *precv_frame = pkt_to_recvframe(pkt);

return precv_frame->u.hdr.rx_head;
}

static inline u8 *pkt_to_recvdata(_pkt *pkt)
{
/* return the rx_data */
union recv_frame *precv_frame = pkt_to_recvframe(pkt);

return precv_frame->u.hdr.rx_data;
}

static inline sint get_recvframe_len(union recv_frame *precvframe)
{
return precvframe->u.hdr.len;
}

struct sta_info;

void _r8712_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv);
Expand Down

0 comments on commit bca7a3f

Please sign in to comment.