svn commit: r209189 - head/sys/dev/usb/wlan

[Jung-uk Kim]

Author: jkim
Date: Mon Jun 14 23:01:50 2010
New Revision: 209189
URL: http://svn.freebsd.org/changeset/base/209189

Log:
  Fix typos that broke duration calculations on protection frames.  A similar
  fix was done for ral(4) long ago and it must be copy-and-paste bugs.
  
  Found by:	clang

Modified:
  head/sys/dev/usb/wlan/if_rum.c
  head/sys/dev/usb/wlan/if_run.c
  head/sys/dev/usb/wlan/if_ural.c

Modified: head/sys/dev/usb/wlan/if_rum.c
==============================================================================
--- head/sys/dev/usb/wlan/if_rum.c	Mon Jun 14 22:02:18 2010	(r209188)
+++ head/sys/dev/usb/wlan/if_rum.c	Mon Jun 14 23:01:50 2010	(r209189)
@@ -1051,7 +1051,7 @@ rum_sendprot(struct rum_softc *sc,
 	ackrate = ieee80211_ack_rate(ic->ic_rt, rate);
 
 	isshort = (ic->ic_flags & IEEE80211_F_SHPREAMBLE) != 0;
-	dur = ieee80211_compute_duration(ic->ic_rt, pktlen, rate, isshort);
+	dur = ieee80211_compute_duration(ic->ic_rt, pktlen, rate, isshort)
 	    + ieee80211_ack_duration(ic->ic_rt, rate, isshort);
 	flags = RT2573_TX_MORE_FRAG;
 	if (prot == IEEE80211_PROT_RTSCTS) {

Modified: head/sys/dev/usb/wlan/if_run.c
==============================================================================
--- head/sys/dev/usb/wlan/if_run.c	Mon Jun 14 22:02:18 2010	(r209188)
+++ head/sys/dev/usb/wlan/if_run.c	Mon Jun 14 23:01:50 2010	(r209189)
@@ -3179,7 +3179,7 @@ run_sendprot(struct run_softc *sc,
 	ackrate = ieee80211_ack_rate(ic->ic_rt, rate);
 
 	isshort = (ic->ic_flags & IEEE80211_F_SHPREAMBLE) != 0;
-	dur = ieee80211_compute_duration(ic->ic_rt, pktlen, rate, isshort);
+	dur = ieee80211_compute_duration(ic->ic_rt, pktlen, rate, isshort)
 	    + ieee80211_ack_duration(ic->ic_rt, rate, isshort);
 	wflags = RT2860_TX_FRAG;
 

Modified: head/sys/dev/usb/wlan/if_ural.c
==============================================================================
--- head/sys/dev/usb/wlan/if_ural.c	Mon Jun 14 22:02:18 2010	(r209188)
+++ head/sys/dev/usb/wlan/if_ural.c	Mon Jun 14 23:01:50 2010	(r209189)
@@ -1157,7 +1157,7 @@ ural_sendprot(struct ural_softc *sc,
 	ackrate = ieee80211_ack_rate(ic->ic_rt, rate);
 
 	isshort = (ic->ic_flags & IEEE80211_F_SHPREAMBLE) != 0;
-	dur = ieee80211_compute_duration(ic->ic_rt, pktlen, rate, isshort);
+	dur = ieee80211_compute_duration(ic->ic_rt, pktlen, rate, isshort)
 	    + ieee80211_ack_duration(ic->ic_rt, rate, isshort);
 	flags = RAL_TX_RETRY(7);
 	if (prot == IEEE80211_PROT_RTSCTS) {