android/android_kernel_cmhtcleo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git://gitorious.org/~rajkosto/linux-on-wince-htc/rajko-linux_on_wince_htc

Browse Source
This commit is contained in:
Jon Benson 2010-09-29 17:04:02 +10:00
commit c29bfbebb2
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -522,6 +522,10 @@ endif # $(dot-config)
# Defaults vmlinux but it is usually overridden in the arch makefile
all: vmlinux
#ifdef CONFIG_MACH_HTCLEO
KBUILD_CFLAGS += -mcpu=cortex-a8 -march=armv7-a -mtune=cortex-a8 -mfpu=vfpv3
#endif
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
KBUILD_CFLAGS += -Os
else

3
drivers/net/wireless/bcm4329/linux_osl.c
View File

@ -360,7 +360,8 @@ osl_pktfree_static(osl_t *osh, void *p, bool send)
for (i = 0; i < MAX_STATIC_PKT_NUM*2; i++)
{
if (p == bcm_static_skb->skb_4k[i])
if ( (i < MAX_STATIC_PKT_NUM && p == bcm_static_skb->skb_4k[i]) ||
(i >= MAX_STATIC_PKT_NUM && p == bcm_static_skb->skb_8k[i-MAX_STATIC_PKT_NUM]) )
{
down(&bcm_static_skb->osl_pkt_sem);
bcm_static_skb->pkt_use[i] = 0;

3
drivers/net/wireless/bcm4329_204/linux_osl.c
View File

@ -360,7 +360,8 @@ osl_pktfree_static(osl_t *osh, void *p, bool send)
for (i = 0; i < MAX_STATIC_PKT_NUM; i++)
{
if (p == bcm_static_skb->skb_4k[i])
if ( (i < MAX_STATIC_PKT_NUM && p == bcm_static_skb->skb_4k[i]) ||
(i >= MAX_STATIC_PKT_NUM && p == bcm_static_skb->skb_8k[i-MAX_STATIC_PKT_NUM]) )
{
down(&bcm_static_skb->osl_pkt_sem);
bcm_static_skb->pkt_use[i] = 0;

3
drivers/net/wireless/bcm4329_245/linux_osl.c
View File

@ -360,7 +360,8 @@ osl_pktfree_static(osl_t *osh, void *p, bool send)
for (i = 0; i < MAX_STATIC_PKT_NUM*2; i++)
{
if (p == bcm_static_skb->skb_4k[i])
if ( (i < MAX_STATIC_PKT_NUM && p == bcm_static_skb->skb_4k[i]) ||
(i >= MAX_STATIC_PKT_NUM && p == bcm_static_skb->skb_8k[i-MAX_STATIC_PKT_NUM]) )
{
down(&bcm_static_skb->osl_pkt_sem);
bcm_static_skb->pkt_use[i] = 0;