Skip to content

Commit

Permalink
brcm80211: util: move brcmu_pkttotlen() function to brcmfmac
Browse files Browse the repository at this point in the history
The functions brcmu_pkttotlen() is only used in brcmfmac driver
so it has been moved there. It also does not use the sk_buff
next pointer anymore but walks a skb queue to determine the total
length.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Arend van Spriel authored and John W. Linville committed Nov 11, 2011
1 parent 02a588a commit 9a95e60
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 17 deletions.
14 changes: 13 additions & 1 deletion drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,18 @@ static uint brcmf_sdbrcm_glom_from_buf(struct brcmf_bus *bus, uint len)
return ret;
}

/* return total length of buffer chain */
static uint brcmf_sdbrcm_glom_len(struct brcmf_bus *bus)
{
struct sk_buff *p;
uint total;

total = 0;
skb_queue_walk(&bus->glom, p)
total += p->len;
return total;
}

static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
{
u16 dlen, totlen;
Expand Down Expand Up @@ -1218,7 +1230,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_bus *bus, u8 rxseq)
}

pfirst = skb_peek(&bus->glom);
dlen = (u16) brcmu_pkttotlen(pfirst);
dlen = (u16) brcmf_sdbrcm_glom_len(bus);

/* Do an SDIO read for the superframe. Configurable iovar to
* read directly into the chained packet, or allocate a large
Expand Down
13 changes: 0 additions & 13 deletions drivers/net/wireless/brcm80211/brcmutil/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,6 @@ void brcmu_pkt_buf_free_skb(struct sk_buff *skb)
}
EXPORT_SYMBOL(brcmu_pkt_buf_free_skb);


/* return total length of buffer chain */
uint brcmu_pkttotlen(struct sk_buff *p)
{
uint total;

total = 0;
for (; p; p = p->next)
total += p->len;
return total;
}
EXPORT_SYMBOL(brcmu_pkttotlen);

/*
* osl multiple-precedence packet queue
* hi_prec is always >= the number of the highest non-empty precedence
Expand Down
3 changes: 0 additions & 3 deletions drivers/net/wireless/brcm80211/include/brcmu_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,6 @@ extern void brcmu_pktq_flush(struct pktq *pq, bool dir,
bool (*fn)(struct sk_buff *, void *), void *arg);

/* externs */
/* packet */
extern uint brcmu_pkttotlen(struct sk_buff *p);

/* ip address */
struct ipv4_addr;

Expand Down

0 comments on commit 9a95e60

Please sign in to comment.