Merge branch 'fix/dw' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw

Conflicts:
	drivers/spi/spi-dw-mid.c

1 files changed, 1 insertions, 0 deletions

diff --git a/net/packet/internal.h b/net/packet/internal.h
index eb9580a6b25f..cdddf6a30399 100644
--- a/net/packet/internal.h
+++ b/net/packet/internal.h
@@ -29,6 +29,7 @@ struct tpacket_kbdq_core {
         char            *pkblk_start;
         char            *pkblk_end;
         int             kblk_size;
+        unsigned int    max_frame_len;
         unsigned int    knum_blocks;
         uint64_t        knxt_seq_num;
         char            *prev;