From 5f8a398f4e591dc62ac3252c83e5d7881081cb27 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 8 Oct 2010 12:07:33 -0700 Subject: [PATCH] --- yaml --- r: 220249 b: refs/heads/master c: c09cc58692f8a6ae341e955c5712884f920b84ab h: refs/heads/master i: 220247: 69f6e82ed7dd46929a95f0f83dc3b57fb32de931 v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/util/hnddma.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index deaaf228662d..847ba27e9d55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96e76e694101c2b09c997bce5f064df0d051b729 +refs/heads/master: c09cc58692f8a6ae341e955c5712884f920b84ab diff --git a/trunk/drivers/staging/brcm80211/util/hnddma.c b/trunk/drivers/staging/brcm80211/util/hnddma.c index d0e8cc485835..d2d2d338a720 100644 --- a/trunk/drivers/staging/brcm80211/util/hnddma.c +++ b/trunk/drivers/staging/brcm80211/util/hnddma.c @@ -128,7 +128,7 @@ typedef struct dma_info { u32 rcvptrbase; /* Base for ptr reg when using unaligned descriptors */ /* tunables */ - u16 rxbufsize; /* rx buffer size in bytes, + unsigned int rxbufsize; /* rx buffer size in bytes, * not including the extra headroom */ uint rxextrahdrroom; /* extra rx headroom, reverseved to assist upper stack @@ -138,7 +138,7 @@ typedef struct dma_info { * Some dongle driver may not need it. */ uint nrxpost; /* # rx buffers to keep posted */ - uint rxoffset; /* rxcontrol offset */ + unsigned int rxoffset; /* rxcontrol offset */ uint ddoffsetlow; /* add to get dma address of descriptor ring, low 32 bits */ uint ddoffsethigh; /* high 32 bits */ uint dataoffsetlow; /* add to get dma address of data buffer, low 32 bits */