diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-16 04:50:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-16 04:50:50 -0400 |
| commit | 2b95bd7d58d368fe5dcbe6f4e494847ea082d89d (patch) | |
| tree | 48c38d792f31f2fe10b26b03bdf1b10a82ca03a4 /include/uapi/linux/packet_diag.h | |
| parent | ffa86c2f1a8862cf58c873f6f14d4b2c3250fb48 (diff) | |
| parent | 69eea5a4ab9c705496e912b55a9d312325de19e6 (diff) | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/packet_diag.h')
| -rw-r--r-- | include/uapi/linux/packet_diag.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/packet_diag.h b/include/uapi/linux/packet_diag.h index d08c63f3dd6f..0c5d5dd61b6a 100644 --- a/include/uapi/linux/packet_diag.h +++ b/include/uapi/linux/packet_diag.h | |||
| @@ -64,7 +64,7 @@ struct packet_diag_mclist { | |||
| 64 | __u32 pdmc_count; | 64 | __u32 pdmc_count; |
| 65 | __u16 pdmc_type; | 65 | __u16 pdmc_type; |
| 66 | __u16 pdmc_alen; | 66 | __u16 pdmc_alen; |
| 67 | __u8 pdmc_addr[MAX_ADDR_LEN]; | 67 | __u8 pdmc_addr[32]; /* MAX_ADDR_LEN */ |
| 68 | }; | 68 | }; |
| 69 | 69 | ||
| 70 | struct packet_diag_ring { | 70 | struct packet_diag_ring { |