diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2017-04-04 11:31:12 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-04-04 11:31:12 +0200 |
| commit | 38bffdac071b720db627bfd2b125a2802a04d419 (patch) | |
| tree | c2e9cf66fa6ff1cc3092079e3eedeb4e6c402227 /include/uapi/linux | |
| parent | locking/ww-mutex: Limit stress test to 2 seconds (diff) | |
| parent | sched/fair: Optimize ___update_sched_avg() (diff) | |
Merge branch 'sched/core' into locking/core
Required for the rtmutex/sched_deadline patches which depend on both
branches
Diffstat (limited to 'include/uapi/linux')
| -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 { __u32 pdmc_count; __u16 pdmc_type; __u16 pdmc_alen; - __u8 pdmc_addr[MAX_ADDR_LEN]; + __u8 pdmc_addr[32]; /* MAX_ADDR_LEN */ }; struct packet_diag_ring { |