Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337070
b: refs/heads/master
c: cbf2f54
h: refs/heads/master
v: v3
  • Loading branch information
Dan Carpenter authored and Greg Kroah-Hartman committed Oct 22, 2012
1 parent 2c75fb6 commit 9600d46
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3e5e624bfda39417cc76e716a350a318049dbd39
refs/heads/master: cbf2f545d7adf9841d4b6ee7fbfa9b1706e369d4
5 changes: 4 additions & 1 deletion trunk/drivers/staging/rtl8192u/ieee80211/ieee80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,10 @@ enum _ReasonCode{



#define aSifsTime ((priv->ieee80211->current_network.mode == IEEE_A)||(priv->ieee80211->current_network.mode == IEEE_N_24G)||(priv->ieee80211->current_network.mode == IEEE_N_5G))? 16 : 10
#define aSifsTime ((priv->ieee80211->current_network.mode == IEEE_A || \
priv->ieee80211->current_network.mode == IEEE_N_24G || \
priv->ieee80211->current_network.mode == IEEE_N_5G) ? \
16 : 10)

#define MGMT_QUEUE_NUM 5

Expand Down

0 comments on commit 9600d46

Please sign in to comment.