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-30 03:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
	drivers/net/bnx2x/bnx2x.h
This commit is contained in:
David S. Miller 2011-03-03 21:27:42 -08:00
commit 0a0e9ae1bd
358 changed files with 3306 additions and 1967 deletions
Download patch file Download diff file Expand all files Collapse all files

1
net/rxrpc/ar-input.c
View file

@ -423,6 +423,7 @@ void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb)
goto protocol_error;
}
case RXRPC_PACKET_TYPE_ACKALL:
case RXRPC_PACKET_TYPE_ACK:
/* ACK processing is done in process context */
read_lock_bh(&call->state_lock);

8
net/rxrpc/ar-key.c
View file

@ -89,11 +89,11 @@ static int rxrpc_instantiate_xdr_rxkad(struct key *key, const __be32 *xdr,
return ret;
plen -= sizeof(*token);
token = kmalloc(sizeof(*token), GFP_KERNEL);
token = kzalloc(sizeof(*token), GFP_KERNEL);
if (!token)
return -ENOMEM;
token->kad = kmalloc(plen, GFP_KERNEL);
token->kad = kzalloc(plen, GFP_KERNEL);
if (!token->kad) {
kfree(token);
return -ENOMEM;
@ -731,10 +731,10 @@ static int rxrpc_instantiate(struct key *key, const void *data, size_t datalen)
goto error;
ret = -ENOMEM;
token = kmalloc(sizeof(*token), GFP_KERNEL);
token = kzalloc(sizeof(*token), GFP_KERNEL);
if (!token)
goto error;
token->kad = kmalloc(plen, GFP_KERNEL);
token->kad = kzalloc(plen, GFP_KERNEL);
if (!token->kad)
goto error_free;