Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 30 Jul 2017 22:17:08 +0000 (UTC)
From:      Andriy Voskoboinyk <avos@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r321732 - head/sys/dev/usb/wlan
Message-ID:  <201707302217.v6UMH8ff074931@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: avos
Date: Sun Jul 30 22:17:08 2017
New Revision: 321732
URL: https://svnweb.freebsd.org/changeset/base/321732

Log:
  zyd: code cleanup + drop unneeded cast.
  
  No functional change intended.

Modified:
  head/sys/dev/usb/wlan/if_zyd.c

Modified: head/sys/dev/usb/wlan/if_zyd.c
==============================================================================
--- head/sys/dev/usb/wlan/if_zyd.c	Sun Jul 30 21:57:19 2017	(r321731)
+++ head/sys/dev/usb/wlan/if_zyd.c	Sun Jul 30 22:17:08 2017	(r321732)
@@ -648,11 +648,12 @@ zyd_intr_read_callback(struct usb_xfer *xfer, usb_erro
 		{
 			struct zyd_notif_retry *retry =
 			    (struct zyd_notif_retry *)cmd->data;
+			uint16_t count = le16toh(retry->count);
 
 			DPRINTF(sc, ZYD_DEBUG_TX_PROC,
 			    "retry intr: rate=0x%x addr=%s count=%d (0x%x)\n",
 			    le16toh(retry->rate), ether_sprintf(retry->macaddr),
-			    le16toh(retry->count)&0xff, le16toh(retry->count));
+			    count & 0xff, count);
 
 			/*
 			 * Find the node to which the packet was sent and
@@ -664,13 +665,12 @@ zyd_intr_read_callback(struct usb_xfer *xfer, usb_erro
 			if (ni != NULL) {
 				struct ieee80211_ratectl_tx_status *txs =
 				    &sc->sc_txs;
-				int retrycnt =
-				    (int)(le16toh(retry->count) & 0xff);
+				int retrycnt = count & 0xff;
 
 				txs->flags =
 				    IEEE80211_RATECTL_STATUS_LONG_RETRY;
 				txs->long_retries = retrycnt;
-				if (le16toh(retry->count) & 0x100) {
+				if (count & 0x100) {
 					txs->status =
 					    IEEE80211_RATECTL_TX_FAIL_LONG;
 				} else {
@@ -682,7 +682,7 @@ zyd_intr_read_callback(struct usb_xfer *xfer, usb_erro
 				ieee80211_ratectl_tx_complete(ni, txs);
 				ieee80211_free_node(ni);
 			}
-			if (le16toh(retry->count) & 0x100)
+			if (count & 0x100)
 				/* too many retries */
 				if_inc_counter(vap->iv_ifp, IFCOUNTER_OERRORS,
 				    1);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707302217.v6UMH8ff074931>