From: Arend van Spriel Date: Tue, 3 May 2011 09:35:32 +0000 (+0200) Subject: staging: brcm80211: remove tsf retrieval from wlc_bmac.c X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=069f4439b9a05902999e49c37d3fe5f83523089d;p=mv-sheeva.git staging: brcm80211: remove tsf retrieval from wlc_bmac.c Upon receiving a packet the lowest 32 bits of tsf are filled in by wlc_bmac in wlc_bmac_recv, but this is not useful as wlc_main needs to reconstruct 64 bit tsf which is retrieves to recover the actual tsf value at which packet is received. Therefore tsf retrieval is removed from wlc_bmac.c. Cc: devel@linuxdriverproject.org Cc: linux-wireless@vger.kernel.org Cc: Brett Rudley Cc: Henry Ptasinski Cc: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c index 8dbf388e6c9..daeb36341a6 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c @@ -265,7 +265,6 @@ wlc_bmac_recv(struct wlc_hw_info *wlc_hw, uint fifo, bool bound) struct sk_buff *tail = NULL; uint n = 0; uint bound_limit = bound ? wlc_hw->wlc->pub->tunables->rxbnd : -1; - u32 tsf_h, tsf_l; wlc_d11rxhdr_t *wlc_rxhdr = NULL; WL_TRACE("wl%d: %s\n", wlc_hw->unit, __func__); @@ -284,9 +283,6 @@ wlc_bmac_recv(struct wlc_hw_info *wlc_hw, uint fifo, bool bound) break; } - /* get the TSF REG reading */ - wlc_bmac_read_tsf(wlc_hw, &tsf_l, &tsf_h); - /* post more rbufs */ dma_rxfill(wlc_hw->di[fifo]); @@ -295,9 +291,7 @@ wlc_bmac_recv(struct wlc_hw_info *wlc_hw, uint fifo, bool bound) head = head->prev; p->prev = NULL; - /* record the tsf_l in wlc_rxd11hdr */ wlc_rxhdr = (wlc_d11rxhdr_t *) p->data; - wlc_rxhdr->tsf_l = cpu_to_le32(tsf_l); /* compute the RSSI from d11rxhdr and record it in wlc_rxd11hr */ wlc_phy_rssi_compute(wlc_hw->band->pi, wlc_rxhdr);