diff --git a/[refs] b/[refs] index c9089e098c4c..72a617274cda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c8bc0147f54ecb43f48d9e898ad7f85cb934db7 +refs/heads/master: b6eb5c0f71af22f7b44353a01241fff9a02997af diff --git a/trunk/drivers/staging/brcm80211/include/bcmutils.h b/trunk/drivers/staging/brcm80211/include/bcmutils.h index 4c1c111bac9b..632bceb480cb 100644 --- a/trunk/drivers/staging/brcm80211/include/bcmutils.h +++ b/trunk/drivers/staging/brcm80211/include/bcmutils.h @@ -149,10 +149,9 @@ /* externs */ /* packet */ - extern uint pktfrombuf(struct osl_info *osh, void *p, uint offset, - int len, unsigned char *buf); - extern uint pktsegcnt(struct osl_info *osh, void *p); - extern uint pkttotlen(struct osl_info *osh, void *p); + extern uint pktfrombuf(struct osl_info *osh, struct sk_buff *p, + uint offset, int len, unsigned char *buf); + extern uint pkttotlen(struct osl_info *osh, struct sk_buff *p); /* ethernet address */ extern int bcm_ether_atoe(char *p, struct ether_addr *ea);