A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 11:11:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse source 
Conflicts:
	drivers/net/ethernet/rocker/rocker.c

The rocker commit was two overlapping changes, one to rename
the ->vport member to ->pport, and another making the bitmask
expression use '1ULL' instead of plain '1'.

Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
David S. Miller 2015-03-03 21:16:48 -05:00
commit 71a83a6db6
1279 changed files with 49670 additions and 20358 deletions
Download patch file Download diff file Expand all files Collapse all files

9
net/rxrpc/ar-ack.c
View file

@ -218,7 +218,8 @@ static void rxrpc_resend(struct rxrpc_call *call)
struct rxrpc_header *hdr;
struct sk_buff *txb;
unsigned long *p_txb, resend_at;
int loop, stop;
bool stop;
int loop;
u8 resend;
_enter("{%d,%d,%d,%d},",
@ -226,7 +227,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
atomic_read(&call->sequence),
CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz));
stop = 0;
stop = false;
resend = 0;
resend_at = 0;
@ -255,11 +256,11 @@ static void rxrpc_resend(struct rxrpc_call *call)
_proto("Tx DATA %%%u { #%d }",
ntohl(sp->hdr.serial), ntohl(sp->hdr.seq));
if (rxrpc_send_packet(call->conn->trans, txb) < 0) {
stop = 0;
stop = true;
sp->resend_at = jiffies + 3;
} else {
sp->resend_at =
jiffies + rxrpc_resend_timeout * HZ;
jiffies + rxrpc_resend_timeout;
}
}