xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:

	drivers/net/cpmac.c
	net/mac80211/mlme.c
This commit is contained in:
David S. Miller
2008-05-25 23:26:10 -07:00
parent 03194379a7 289c79a4bd
commit 43154d08d6
93 changed files with 1106 additions and 1071 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/hamradio/scc.c
View File

@@ -1340,9 +1340,10 @@ static unsigned int scc_set_param(struct scc_channel *scc, unsigned int cmd, uns
case PARAM_RTS:
if ( !(scc->wreg[R5] & RTS) )
{
if (arg != TX_OFF)
if (arg != TX_OFF) {
scc_key_trx(scc, TX_ON);
scc_start_tx_timer(scc, t_txdelay, scc->kiss.txdelay);
}
} else {
if (arg == TX_OFF)
{