diff options
author | mike.rapoport@gmail.com | 2010-10-13 00:09:08 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2010-10-14 21:27:50 +0200 |
commit | 6a92fdf1b923fa5b6d6dd08a7bba80fb3d9e5eaf (patch) | |
tree | f6dd661c97f394f2d3fc63cc051437221e80d9f1 /drivers/staging/brcm80211/util | |
parent | Staging: brcm80211: fix up compiler warnings I created (diff) | |
download | kernel-qcow2-linux-6a92fdf1b923fa5b6d6dd08a7bba80fb3d9e5eaf.tar.gz kernel-qcow2-linux-6a92fdf1b923fa5b6d6dd08a7bba80fb3d9e5eaf.tar.xz kernel-qcow2-linux-6a92fdf1b923fa5b6d6dd08a7bba80fb3d9e5eaf.zip |
staging: brcm80211: remove DHD_USE_STATIC_BUF
The DHD_USE_STATIC_BUF cannot be enabled in the build configuration,
remove it.
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/util')
-rw-r--r-- | drivers/staging/brcm80211/util/linux_osl.c | 180 |
1 files changed, 0 insertions, 180 deletions
diff --git a/drivers/staging/brcm80211/util/linux_osl.c b/drivers/staging/brcm80211/util/linux_osl.c index 6616174a3092..7c7d14bc1c28 100644 --- a/drivers/staging/brcm80211/util/linux_osl.c +++ b/drivers/staging/brcm80211/util/linux_osl.c @@ -33,28 +33,6 @@ #define OS_HANDLE_MAGIC 0x1234abcd /* Magic # to recognise osh */ #define BCM_MEM_FILENAME_LEN 24 /* Mem. filename length */ -#if defined(BRCM_FULLMAC) && defined(DHD_USE_STATIC_BUF) -#define MAX_STATIC_BUF_NUM 16 -#define STATIC_BUF_SIZE (PAGE_SIZE*2) -#define STATIC_BUF_TOTAL_LEN (MAX_STATIC_BUF_NUM*STATIC_BUF_SIZE) -typedef struct bcm_static_buf { - struct semaphore static_sem; - unsigned char *buf_ptr; - unsigned char buf_use[MAX_STATIC_BUF_NUM]; -} bcm_static_buf_t; - -static bcm_static_buf_t *bcm_static_buf; - -#define MAX_STATIC_PKT_NUM 8 -typedef struct bcm_static_pkt { - struct sk_buff *skb_4k[MAX_STATIC_PKT_NUM]; - struct sk_buff *skb_8k[MAX_STATIC_PKT_NUM]; - struct semaphore osl_pkt_sem; - unsigned char pkt_use[MAX_STATIC_PKT_NUM * 2]; -} bcm_static_pkt_t; -static bcm_static_pkt_t *bcm_static_skb; -#endif /* DHD_USE_STATIC_BUF */ - struct osl_info { osl_pubinfo_t pub; uint magic; @@ -174,39 +152,6 @@ osl_t *osl_attach(void *pdev, uint bustype, bool pkttag) break; } -#if defined(BRCM_FULLMAC) && defined(DHD_USE_STATIC_BUF) - if (!bcm_static_buf) { - bcm_static_buf = (bcm_static_buf_t *) dhd_os_prealloc(3, - STATIC_BUF_SIZE + STATIC_BUF_TOTAL_LEN); - if (!bcm_static_buf) { - printk(KERN_ERR "can not alloc static buf!\n"); - } else - printk(KERN_ERR "alloc static buf at %x!\n", - (unsigned int)bcm_static_buf); - - init_MUTEX(&bcm_static_buf->static_sem); - - bcm_static_buf->buf_ptr = - (unsigned char *)bcm_static_buf + STATIC_BUF_SIZE; - - } - - if (!bcm_static_skb) { - int i; - void *skb_buff_ptr = 0; - bcm_static_skb = - (bcm_static_pkt_t *) ((char *)bcm_static_buf + 2048); - skb_buff_ptr = dhd_os_prealloc(4, 0); - - bcopy(skb_buff_ptr, bcm_static_skb, - sizeof(struct sk_buff *) * 16); - for (i = 0; i < MAX_STATIC_PKT_NUM * 2; i++) - bcm_static_skb->pkt_use[i] = 0; - - init_MUTEX(&bcm_static_skb->osl_pkt_sem); - } -#endif /* defined(BRCM_FULLMAC) && defined(DHD_USE_STATIC_BUF) */ - #if defined(BCMDBG) && !defined(BRCM_FULLMAC) if (pkttag) { struct sk_buff *skb; @@ -221,13 +166,6 @@ void osl_detach(osl_t *osh) if (osh == NULL) return; -#if defined(BRCM_FULLMAC) && defined(DHD_USE_STATIC_BUF) - if (bcm_static_buf) - bcm_static_buf = 0; - - if (bcm_static_skb) - bcm_static_skb = 0; -#endif ASSERT(osh->magic == OS_HANDLE_MAGIC); kfree(osh); } @@ -282,73 +220,6 @@ void BCMFASTPATH osl_pktfree(osl_t *osh, void *p, bool send) } } -#if defined(BRCM_FULLMAC) && defined(DHD_USE_STATIC_BUF) -void *osl_pktget_static(osl_t *osh, uint len) -{ - int i = 0; - struct sk_buff *skb; - - if (len > (PAGE_SIZE * 2)) { - printk(KERN_ERR "Do we really need this big skb??\n"); - return osl_pktget(osh, len); - } - - down(&bcm_static_skb->osl_pkt_sem); - if (len <= PAGE_SIZE) { - for (i = 0; i < MAX_STATIC_PKT_NUM; i++) { - if (bcm_static_skb->pkt_use[i] == 0) - break; - } - - if (i != MAX_STATIC_PKT_NUM) { - bcm_static_skb->pkt_use[i] = 1; - up(&bcm_static_skb->osl_pkt_sem); - - skb = bcm_static_skb->skb_4k[i]; - skb->tail = skb->data + len; - skb->len = len; - - return skb; - } - } - - for (i = 0; i < MAX_STATIC_PKT_NUM; i++) { - if (bcm_static_skb->pkt_use[i + MAX_STATIC_PKT_NUM] == 0) - break; - } - - if (i != MAX_STATIC_PKT_NUM) { - bcm_static_skb->pkt_use[i + MAX_STATIC_PKT_NUM] = 1; - up(&bcm_static_skb->osl_pkt_sem); - skb = bcm_static_skb->skb_8k[i]; - skb->tail = skb->data + len; - skb->len = len; - - return skb; - } - - up(&bcm_static_skb->osl_pkt_sem); - printk(KERN_ERR "all static pkt in use!\n"); - return osl_pktget(osh, len); -} - -void osl_pktfree_static(osl_t *osh, void *p, bool send) -{ - int i; - - for (i = 0; i < MAX_STATIC_PKT_NUM * 2; i++) { - if (p == bcm_static_skb->skb_4k[i]) { - down(&bcm_static_skb->osl_pkt_sem); - bcm_static_skb->pkt_use[i] = 0; - up(&bcm_static_skb->osl_pkt_sem); - - return; - } - } - return osl_pktfree(osh, p, send); -} -#endif /* defined(BRCM_FULLMAC) && defined(DHD_USE_STATIC_BUF) */ - u32 osl_pci_read_config(osl_t *osh, uint offset, uint size) { uint val = 0; @@ -422,35 +293,6 @@ void *osl_malloc(osl_t *osh, uint size) if (osh) ASSERT(osh->magic == OS_HANDLE_MAGIC); -#if defined(BRCM_FULLMAC) && defined(DHD_USE_STATIC_BUF) - if (bcm_static_buf) { - int i = 0; - if ((size >= PAGE_SIZE) && (size <= STATIC_BUF_SIZE)) { - down(&bcm_static_buf->static_sem); - for (i = 0; i < MAX_STATIC_BUF_NUM; i++) { - if (bcm_static_buf->buf_use[i] == 0) - break; - } - if (i == MAX_STATIC_BUF_NUM) { - up(&bcm_static_buf->static_sem); - printk(KERN_ERR "all static buff in use!\n"); - goto original; - } - bcm_static_buf->buf_use[i] = 1; - up(&bcm_static_buf->static_sem); - - bzero(bcm_static_buf->buf_ptr + STATIC_BUF_SIZE * i, - size); - if (osh) - osh->malloced += size; - - return (void *)(bcm_static_buf->buf_ptr + - STATIC_BUF_SIZE * i); - } - } - original: -#endif /* defined(BRCM_FULLMAC) && defined(DHD_USE_STATIC_BUF) */ - addr = kmalloc(size, GFP_ATOMIC); if (addr == NULL) { if (osh) @@ -465,28 +307,6 @@ void *osl_malloc(osl_t *osh, uint size) void osl_mfree(osl_t *osh, void *addr, uint size) { -#if defined(BRCM_FULLMAC) && defined(DHD_USE_STATIC_BUF) - if (bcm_static_buf) { - if ((addr > (void *)bcm_static_buf) && ((unsigned char *)addr - <= ((unsigned char *) - bcm_static_buf + - STATIC_BUF_TOTAL_LEN))) { - int buf_idx = 0; - buf_idx = - ((unsigned char *)addr - - bcm_static_buf->buf_ptr) / STATIC_BUF_SIZE; - down(&bcm_static_buf->static_sem); - bcm_static_buf->buf_use[buf_idx] = 0; - up(&bcm_static_buf->static_sem); - - if (osh) { - ASSERT(osh->magic == OS_HANDLE_MAGIC); - osh->malloced -= size; - } - return; - } - } -#endif /* defined(BRCM_FULLMAC) && defined(DHD_USE_STATIC_BUF) */ if (osh) { ASSERT(osh->magic == OS_HANDLE_MAGIC); osh->malloced -= size; |