Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[pandora-kernel.git] / drivers / staging / brcm80211 / util / bcmutils.c

diff --git a/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/util/bcmutils.c
index 64d1440..fd30cc6 100644 (file)
--- a/drivers/staging/brcm80211/util/bcmutils.c
+++ b/drivers/staging/brcm80211/util/bcmutils.c
@@ -198,7 +198,7 @@ void pktq_pflush(struct osl_info *osh, struct pktq *pq, int prec, bool dir)
        while (p) {
                q->head = p->prev;
                p->prev = NULL;
-               PKTFREE(osh, p, dir);
+               pkt_buf_free_skb(osh, p, dir);
                q->len--;
                pq->len--;
                p = q->head;
@@ -232,7 +232,7 @@ pktq_pflush(struct osl_info *osh, struct pktq *pq, int prec, bool dir,
                        else
                                prev->prev = p->prev;
                        p->prev = NULL;
-                       PKTFREE(osh, p, dir);
+                       pkt_buf_free_skb(osh, p, dir);
                        q->len--;
                        pq->len--;
                        p = (head ? q->head : prev->prev);
@@ -379,7 +379,7 @@ char *getvar(char *vars, const char *name)
 
        /* first look in vars[] */
        for (s = vars; s && *s;) {
-               if ((bcmp(s, name, len) == 0) && (s[len] == '='))
+               if ((memcmp(s, name, len) == 0) && (s[len] == '='))
                        return &s[len + 1];
 
                while (*s++)