diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-08-21 14:20:37 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-21 14:20:37 +0000 |
commit | 0340ff10910d1daf161dc81ba6ffc85e47faa09b (patch) | |
tree | 6dfac79e184d221cd925de4703d55d99bc3a8d6d /include/linux/ipv6.h | |
parent | 6484c6ca6b91d1e2b107d296e7306de3f6e422b2 (diff) | |
parent | 74c41fb6f52268470b4552ca543515be210c71fb (diff) |
Merge branch 'testing/defconfig-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into testing/multiplatformtracking-multiplatform-llct-20120821.0
Conflicts:
arch/arm/mach-pxa/cm-x2xx.c
sound/soc/ux500/ux500_msp_dai.c
sound/soc/ux500/ux500_msp_i2s.c
sound/soc/ux500/ux500_msp_i2s.h
Diffstat (limited to 'include/linux/ipv6.h')
-rw-r--r-- | include/linux/ipv6.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 379e433e15e0..879db26ec401 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -369,6 +369,7 @@ struct ipv6_pinfo { __u8 rcv_tclass; __u32 dst_cookie; + __u32 rx_dst_cookie; struct ipv6_mc_socklist __rcu *ipv6_mc_list; struct ipv6_ac_socklist *ipv6_ac_list; |