summaryrefslogtreecommitdiff
path: root/curvetun.c
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-07-23 09:19:30 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-07-23 09:19:30 +0200
commit57e04d5a77cc9541ad8dcb81a134644ed2a640be (patch)
tree10fe27c2fb81286bbeb97b103f9970249998cc4a /curvetun.c
parent29e7beed6e387b78c86e985e0c96e24154a01dec (diff)
built_in: fix build if ARPHRD_IEEE802154_MONITOR is undefined
Some 3.x kernel versions seem not to ship yet the definition of ARPHRD_IEEE802154_MONITOR. Add it into built_in.h to let the tools build. Reported-by: Pablo Henrique <phenrique@gmail.com> Reported-by: Tobias Kalbitz <tobias.kalbitz@gmail.com> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'curvetun.c')
0 files changed, 0 insertions, 0 deletions
11/chan.c?h=nds-private-remove&id=396bf4cd835e62d70fad4a03a8963e61f19021f2&id2=7c2cf1c4615cc2f576d0604406cdf0065f00b83b'>diff)
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
Diffstat (limited to 'net/mac80211/chan.c')