Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / brcm80211 / brcmfmac / dhd_common.c

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index 703188fc28ec9f26a87b6aeed82ac6d5f720580b..3dbf72eebd4ab3e2992deb4ec3c9db5fef372a4d 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <bcmdefs.h>
+#include <linux/netdevice.h>
 #include <osl.h>
 #include <bcmutils.h>
 #include <bcmendian.h>
@@ -326,9 +327,10 @@ void dhd_store_conn_status(u32 event, u32 status, u32 reason)
        }
 }
 
-bool dhd_prec_enq(dhd_pub_t *dhdp, struct pktq *q, void *pkt, int prec)
+bool dhd_prec_enq(dhd_pub_t *dhdp, struct pktq *q, struct sk_buff *pkt,
+                 int prec)
 {
-       void *p;
+       struct sk_buff *p;
        int eprec = -1;         /* precedence to evict from */
        bool discard_oldest;
 
@@ -366,7 +368,7 @@ bool dhd_prec_enq(dhd_pub_t *dhdp, struct pktq *q, void *pkt, int prec)
                        ASSERT(p);
                }
 
-               PKTFREE(dhdp->osh, p, true);
+               pkt_buf_free_skb(dhdp->osh, p, true);
        }
 
        /* Enqueue */
@@ -832,7 +834,7 @@ wl_host_event(struct dhd_info *dhd, int *ifidx, void *pktdata,
        u16 flags;
        int evlen;
 
-       if (bcmp(BRCM_OUI, &pvt_data->bcm_hdr.oui[0], DOT11_OUI_LEN)) {
+       if (memcmp(BRCM_OUI, &pvt_data->bcm_hdr.oui[0], DOT11_OUI_LEN)) {
                DHD_ERROR(("%s: mismatched OUI, bailing\n", __func__));
                return BCME_ERROR;
        }
@@ -1254,7 +1256,7 @@ int dhd_preinit_ioctls(dhd_pub_t *dhd)
         */
        ret = dhd_custom_get_mac_address(ea_addr.octet);
        if (!ret) {
-               bcm_mkiovar("cur_etheraddr", (void *)&ea_addr, ETHER_ADDR_LEN,
+               bcm_mkiovar("cur_etheraddr", (void *)&ea_addr, ETH_ALEN,
                            buf, sizeof(buf));
                ret = dhdcdc_set_ioctl(dhd, 0, WLC_SET_VAR, buf, sizeof(buf));
                if (ret < 0) {
@@ -1262,7 +1264,7 @@ int dhd_preinit_ioctls(dhd_pub_t *dhd)
                                   __func__, ret));
                } else
                        memcpy(dhd->mac.octet, (void *)&ea_addr,
-                              ETHER_ADDR_LEN);
+                              ETH_ALEN);
        }
 #endif                         /* GET_CUSTOM_MAC_ENABLE */
 
@@ -1532,7 +1534,7 @@ int dhd_iscan_delete_bss(void *dhdp, void *addr, iscan_buf_t *iscan_skip)
                                        break;
 
                                if (!memcmp
-                                   (bi->BSSID.octet, addr, ETHER_ADDR_LEN)) {
+                                   (bi->BSSID.octet, addr, ETH_ALEN)) {
                                        DHD_ISCAN(("%s: Del BSS[%2.2d:%2.2d] "
                                        "%X:%X:%X:%X:%X:%X\n",
                                        __func__, l, i, bi->BSSID.octet[0],
@@ -1670,7 +1672,7 @@ int dhd_iscan_request(void *dhdp, u16 action)
        char buf[WLC_IOCTL_SMLEN];
 
        memset(&params, 0, sizeof(wl_iscan_params_t));
-       memcpy(&params.params.bssid, &ether_bcast, ETHER_ADDR_LEN);
+       memcpy(&params.params.bssid, &ether_bcast, ETH_ALEN);
 
        params.params.bss_type = DOT11_BSSTYPE_ANY;
        params.params.scan_type = DOT11_SCANTYPE_ACTIVE;