← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to net/ipv6/xfrm6_tunnel.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/ipv6/xfrm6_tunnel.c
68
68
 
69
69
static struct kmem_cache *xfrm6_tunnel_spi_kmem __read_mostly;
70
70
 
71
 
static inline unsigned xfrm6_tunnel_spi_hash_byaddr(const xfrm_address_t *addr)
 
71
static inline unsigned int xfrm6_tunnel_spi_hash_byaddr(const xfrm_address_t *addr)
72
72
{
73
 
        unsigned h;
 
73
        unsigned int h;
74
74
 
75
75
        h = (__force u32)(addr->a6[0] ^ addr->a6[1] ^ addr->a6[2] ^ addr->a6[3]);
76
76
        h ^= h >> 16;
80
80
        return h;
81
81
}
82
82
 
83
 
static inline unsigned xfrm6_tunnel_spi_hash_byspi(u32 spi)
 
83
static inline unsigned int xfrm6_tunnel_spi_hash_byspi(u32 spi)
84
84
{
85
85
        return spi % XFRM6_TUNNEL_SPI_BYSPI_HSIZE;
86
86
}