#ifndef BPF_EXT
#define BPF_EXT
#ifndef SKF_AD_OFF
# define SKF_AD_OFF (-0x1000)
#endif
#ifndef SKF_AD_PROTOCOL
# define SKF_AD_PROTOCOL 0
#endif
#ifndef SKF_AD_PKTTYPE
# define SKF_AD_PKTTYPE 4
#endif
#ifndef SKF_AD_IFINDEX
# define SKF_AD_IFINDEX 8
#endif
#ifndef SKF_AD_NLATTR
# define SKF_AD_NLATTR 12
#endif
#ifndef SKF_AD_NLATTR_NEST
# define SKF_AD_NLATTR_NEST 16
#endif
#ifndef SKF_AD_MARK
# define SKF_AD_MARK 20
#endif
#ifndef SKF_AD_QUEUE
# define SKF_AD_QUEUE 24
#endif
#ifndef SKF_AD_HATYPE
# define SKF_AD_HATYPE 28
#endif
#ifndef SKF_AD_RXHASH
# define SKF_AD_RXHASH 32
#endif
#ifndef SKF_AD_CPU
# define SKF_AD_CPU 36
#endif
#ifndef SKF_AD_VLAN_TAG
# define SKF_AD_VLAN_TAG 44
#endif
#ifndef SKF_AD_VLAN_TAG_PRESENT
# define SKF_AD_VLAN_TAG_PRESENT 48
#endif
#ifndef SKF_AD_PAY_OFFSET
# define SKF_AD_PAY_OFFSET 52
#endif
#endif /* BPF_EXT */
: net-next.git
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
- use-after-free in algif_aead
- modular aesni regression when pcbc is modular but absent
- bug causing IO page faults in ccp
- double list add in ccp
- NULL pointer dereference in qat (two patches)
- panic in chcr
- NULL pointer dereference in chcr
- out-of-bound access in chcr
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: chcr - Fix key length for RFC4106
crypto: algif_aead - Fix kernel panic on list_del
crypto: aesni - Fix failure when pcbc module is absent
crypto: ccp - Fix double add when creating new DMA command
crypto: ccp - Fix DMA operations when IOMMU is enabled
crypto: chcr - Check device is allocated before use
crypto: chcr - Fix panic on dma_unmap_sg
crypto: qat - zero esram only for DH85x devices
crypto: qat - fix bar discovery for c62x