diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /net/packet/internal.h | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'net/packet/internal.h')
| -rw-r--r-- | net/packet/internal.h | 1 |
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 { | |||
| 29 | char *pkblk_start; | 29 | char *pkblk_start; |
| 30 | char *pkblk_end; | 30 | char *pkblk_end; |
| 31 | int kblk_size; | 31 | int kblk_size; |
| 32 | unsigned int max_frame_len; | ||
| 32 | unsigned int knum_blocks; | 33 | unsigned int knum_blocks; |
| 33 | uint64_t knxt_seq_num; | 34 | uint64_t knxt_seq_num; |
| 34 | char *prev; | 35 | char *prev; |