aboutsummaryrefslogtreecommitdiffstats
path: root/net/rxrpc/ar-key.c
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2012-04-15 01:58:06 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-15 12:44:40 -0400
commit95c961747284a6b83a5e2d81240e214b0fa3464d (patch)
treec7be86a00db3605a48a03109fafcbe31039ca2e0 /net/rxrpc/ar-key.c
parent5e73ea1a31c3612aa6dfe44f864ca5b7b6a4cff9 (diff)
net: cleanup unsigned to unsigned int
Use of "unsigned int" is preferred to bare "unsigned" in net tree. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rxrpc/ar-key.c')
-rw-r--r--net/rxrpc/ar-key.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/net/rxrpc/ar-key.c b/net/rxrpc/ar-key.c
index ae3a035f5390..8b1f9f49960f 100644
--- a/net/rxrpc/ar-key.c
+++ b/net/rxrpc/ar-key.c
@@ -82,7 +82,7 @@ static int rxrpc_vet_description_s(const char *desc)
82 * - the caller guarantees we have at least 4 words 82 * - the caller guarantees we have at least 4 words
83 */ 83 */
84static int rxrpc_instantiate_xdr_rxkad(struct key *key, const __be32 *xdr, 84static int rxrpc_instantiate_xdr_rxkad(struct key *key, const __be32 *xdr,
85 unsigned toklen) 85 unsigned int toklen)
86{ 86{
87 struct rxrpc_key_token *token, **pptoken; 87 struct rxrpc_key_token *token, **pptoken;
88 size_t plen; 88 size_t plen;
@@ -210,10 +210,10 @@ static void rxrpc_rxk5_free(struct rxk5_key *rxk5)
210 */ 210 */
211static int rxrpc_krb5_decode_principal(struct krb5_principal *princ, 211static int rxrpc_krb5_decode_principal(struct krb5_principal *princ,
212 const __be32 **_xdr, 212 const __be32 **_xdr,
213 unsigned *_toklen) 213 unsigned int *_toklen)
214{ 214{
215 const __be32 *xdr = *_xdr; 215 const __be32 *xdr = *_xdr;
216 unsigned toklen = *_toklen, n_parts, loop, tmp; 216 unsigned int toklen = *_toklen, n_parts, loop, tmp;
217 217
218 /* there must be at least one name, and at least #names+1 length 218 /* there must be at least one name, and at least #names+1 length
219 * words */ 219 * words */
@@ -286,10 +286,10 @@ static int rxrpc_krb5_decode_principal(struct krb5_principal *princ,
286static int rxrpc_krb5_decode_tagged_data(struct krb5_tagged_data *td, 286static int rxrpc_krb5_decode_tagged_data(struct krb5_tagged_data *td,
287 size_t max_data_size, 287 size_t max_data_size,
288 const __be32 **_xdr, 288 const __be32 **_xdr,
289 unsigned *_toklen) 289 unsigned int *_toklen)
290{ 290{
291 const __be32 *xdr = *_xdr; 291 const __be32 *xdr = *_xdr;
292 unsigned toklen = *_toklen, len; 292 unsigned int toklen = *_toklen, len;
293 293
294 /* there must be at least one tag and one length word */ 294 /* there must be at least one tag and one length word */
295 if (toklen <= 8) 295 if (toklen <= 8)
@@ -330,11 +330,11 @@ static int rxrpc_krb5_decode_tagged_array(struct krb5_tagged_data **_td,
330 u8 max_n_elem, 330 u8 max_n_elem,
331 size_t max_elem_size, 331 size_t max_elem_size,
332 const __be32 **_xdr, 332 const __be32 **_xdr,
333 unsigned *_toklen) 333 unsigned int *_toklen)
334{ 334{
335 struct krb5_tagged_data *td; 335 struct krb5_tagged_data *td;
336 const __be32 *xdr = *_xdr; 336 const __be32 *xdr = *_xdr;
337 unsigned toklen = *_toklen, n_elem, loop; 337 unsigned int toklen = *_toklen, n_elem, loop;
338 int ret; 338 int ret;
339 339
340 /* there must be at least one count */ 340 /* there must be at least one count */
@@ -380,10 +380,10 @@ static int rxrpc_krb5_decode_tagged_array(struct krb5_tagged_data **_td,
380 * extract a krb5 ticket 380 * extract a krb5 ticket
381 */ 381 */
382static int rxrpc_krb5_decode_ticket(u8 **_ticket, u16 *_tktlen, 382static int rxrpc_krb5_decode_ticket(u8 **_ticket, u16 *_tktlen,
383 const __be32 **_xdr, unsigned *_toklen) 383 const __be32 **_xdr, unsigned int *_toklen)
384{ 384{
385 const __be32 *xdr = *_xdr; 385 const __be32 *xdr = *_xdr;
386 unsigned toklen = *_toklen, len; 386 unsigned int toklen = *_toklen, len;
387 387
388 /* there must be at least one length word */ 388 /* there must be at least one length word */
389 if (toklen <= 4) 389 if (toklen <= 4)
@@ -419,7 +419,7 @@ static int rxrpc_krb5_decode_ticket(u8 **_ticket, u16 *_tktlen,
419 * - the caller guarantees we have at least 4 words 419 * - the caller guarantees we have at least 4 words
420 */ 420 */
421static int rxrpc_instantiate_xdr_rxk5(struct key *key, const __be32 *xdr, 421static int rxrpc_instantiate_xdr_rxk5(struct key *key, const __be32 *xdr,
422 unsigned toklen) 422 unsigned int toklen)
423{ 423{
424 struct rxrpc_key_token *token, **pptoken; 424 struct rxrpc_key_token *token, **pptoken;
425 struct rxk5_key *rxk5; 425 struct rxk5_key *rxk5;
@@ -549,7 +549,7 @@ static int rxrpc_instantiate_xdr(struct key *key, const void *data, size_t datal
549{ 549{
550 const __be32 *xdr = data, *token; 550 const __be32 *xdr = data, *token;
551 const char *cp; 551 const char *cp;
552 unsigned len, tmp, loop, ntoken, toklen, sec_ix; 552 unsigned int len, tmp, loop, ntoken, toklen, sec_ix;
553 int ret; 553 int ret;
554 554
555 _enter(",{%x,%x,%x,%x},%zu", 555 _enter(",{%x,%x,%x,%x},%zu",