Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38afd6ad authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 8ed1383f 261688d0

crypto/cipher.c

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static unsigned int crypt_slow(const struct cipher_desc *desc, 
			       struct scatter_walk *in,

			       struct scatter_walk *out, unsigned int bsize)

{

	unsigned int alignmask = crypto_tfm_alg_alignmask(desc->tfm);

	unsigned long alignmask = crypto_tfm_alg_alignmask(desc->tfm);

	u8 buffer[bsize * 2 + alignmask];

	u8 *src = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);

	u8 *dst = src + bsize;
@@ -160,7 +160,7 @@ static int crypt_iv_unaligned(struct cipher_desc *desc, 
			      unsigned int nbytes)

{

	struct crypto_tfm *tfm = desc->tfm;

	unsigned int alignmask = crypto_tfm_alg_alignmask(tfm);

	unsigned long alignmask = crypto_tfm_alg_alignmask(tfm);

	u8 *iv = desc->info;



	if (unlikely(((unsigned long)iv & alignmask))) {
@@ -424,7 +424,7 @@ int crypto_init_cipher_ops(struct crypto_tfm *tfm) 
	}

	

	if (ops->cit_mode == CRYPTO_TFM_MODE_CBC) {

		unsigned int align;

		unsigned long align;

		unsigned long addr;

	    	

	    	switch (crypto_tfm_alg_blocksize(tfm)) {

crypto/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static inline unsigned int crypto_cipher_ctxsize(struct crypto_alg *alg, 
	

	switch (flags & CRYPTO_TFM_MODE_MASK) {

	case CRYPTO_TFM_MODE_CBC:

		len = ALIGN(len, alg->cra_alignmask + 1);

		len = ALIGN(len, (unsigned long)alg->cra_alignmask + 1);

		len += alg->cra_blocksize;

		break;

	}

drivers/atm/ambassador.c

+3 −1
Original line number Diff line number Diff line
@@ -794,7 +794,9 @@ static void drain_rx_pools (amb_dev * dev) { 
    drain_rx_pool (dev, pool);

}



static inline void fill_rx_pool (amb_dev * dev, unsigned char pool, int priority) {

static inline void fill_rx_pool (amb_dev * dev, unsigned char pool,

                                 unsigned int __nocast priority)

{

  rx_in rx;

  amb_rxq * rxq;

drivers/atm/firestream.c

+4 −2
Original line number Diff line number Diff line
@@ -1374,7 +1374,8 @@ static void reset_chip (struct fs_dev *dev) 
	}

}



static void __devinit *aligned_kmalloc (int size, int flags, int alignment)

static void __devinit *aligned_kmalloc (int size, unsigned int __nocast flags,

					int alignment)

{

	void  *t;
@@ -1464,7 +1465,8 @@ static inline int nr_buffers_in_freepool (struct fs_dev *dev, struct freepool *f 
   does. I've seen "receive abort: no buffers" and things started

   working again after that...  -- REW */



static void top_off_fp (struct fs_dev *dev, struct freepool *fp, int gfp_flags)

static void top_off_fp (struct fs_dev *dev, struct freepool *fp,

			unsigned int __nocast gfp_flags)

{

	struct FS_BPENTRY *qe, *ne;

	struct sk_buff *skb;

drivers/atm/he.c

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 


#include <linux/config.h>

#include <linux/module.h>

#include <linux/version.h>

#include <linux/kernel.h>

#include <linux/skbuff.h>

#include <linux/pci.h>