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

1 files changed, 2 insertions, 2 deletions

diff --git a/dissector.h b/dissector.h
index 226d2bc..d8ad6ac 100644
--- a/dissector.h
+++ b/dissector.h
@@ -34,8 +34,8 @@ static const char * const packet_types[256] = {
 	[PACKET_MULTICAST]	=	"M",  /* Multicast */
 	[PACKET_OTHERHOST]	=	"P",  /* Promisc */
 	[PACKET_OUTGOING]	=	">",  /* Outgoing */
-	[PACKET_USER]		=	">U", /* To Userspace */
-	[PACKET_KERNEL]		=	">K", /* To Kernelspace */
+	[PACKET_USER]		=	"K->U", /* To Userspace */
+	[PACKET_KERNEL]		=	"U->K", /* To Kernelspace */
 };
 
 static inline const char *__show_ts_source(uint32_t status)