This backmerges Linus' merge commit of the latest drm-fixes pull: commit 549f3a1218ba18fcde11ef0e22b07e6365645788 Merge: 42577ca 058ca4a Author: Linus Torvalds <torvalds@linux-foundation.org> Date: Tue Jul 23 15:47:08 2013 -0700 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux We've accrued a few too many conflicts, but the real reason is that I want to merge the 100% solution for Haswell concurrent registers writes into drm-intel-next. But that depends upon the 90% bandaid merged into -fixes: commit a7cd1b8fea2f341b626b255d9898a5ca5fabbf0a Author: Chris Wilson <chris@chris-wilson.co.uk> Date: Fri Jul 19 20:36:51 2013 +0100 drm/i915: Serialize almost all register access Also, we can roll up on accrued conflicts. Usually I'd backmerge a tagged -rc, but I want to get this done before heading off to vacations next week ;-) Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/i915_gem.c v2: For added hilarity we have a init sequence conflict around the gt_lock, so need to move that one, too. Spotted by Jani Nikula.
Showing the changes to include/uapi (41 of 9108 files). Show all
Unified · Split
| @@ -84,6 +84,14 @@ · 83 unmodified lines | ||
| 84 | 84 | #define O_PATH 010000000 |
| 85 | 85 | #endif |
| 86 | 86 | |
| 87 | +#ifndef __O_TMPFILE | |
| 88 | +#define __O_TMPFILE 020000000 | |
| 89 | +#endif | |
| 90 | + | |
| 91 | +/* a horrid kludge trying to make sure that this will fail on old kernels */ | |
| 92 | +#define O_TMPFILE (__O_TMPFILE | O_DIRECTORY) | |
| 93 | +#define O_TMPFILE_MASK (__O_TMPFILE | O_DIRECTORY | O_CREAT) | |
| 94 | + | |
| 87 | 95 | #ifndef O_NDELAY |
| 88 | 96 | #define O_NDELAY O_NONBLOCK |
| 89 | 97 | #endif |
| @@ -30,6 +30,8 @@ · 29 unmodified lines | ||
| 30 | 30 | |
| 31 | 31 | #define POLLFREE 0x4000 /* currently only for epoll */ |
| 32 | 32 | |
| 33 | +#define POLL_BUSY_LOOP 0x8000 | |
| 34 | + | |
| 33 | 35 | struct pollfd { |
| 34 | 36 | int fd; |
| 35 | 37 | short events; |
| @@ -76,4 +76,6 @@ · 75 unmodified lines | ||
| 76 | 76 | |
| 77 | 77 | #define SO_SELECT_ERR_QUEUE 45 |
| 78 | 78 | |
| 79 | +#define SO_BUSY_POLL 46 | |
| 80 | + | |
| 79 | 81 | #endif /* __ASM_GENERIC_SOCKET_H */ |
| @@ -361,7 +361,7 @@ __SYSCALL(__NR_syslog, sys_syslog) · 360 unmodified lines | ||
| 361 | 361 | #define __NR_ptrace 117 |
| 362 | 362 | __SYSCALL(__NR_ptrace, sys_ptrace) |
| 363 | 363 | |
| 364 | −/* kernel/sched.c */ | |
| 364 | +/* kernel/sched/core.c */ | |
| 365 | 365 | #define __NR_sched_setparam 118 |
| 366 | 366 | __SYSCALL(__NR_sched_setparam, sys_sched_setparam) |
| 367 | 367 | #define __NR_sched_setscheduler 119 |
| @@ -62,6 +62,7 @@ header-y += auxvec.h · 61 unmodified lines | ||
| 62 | 62 | header-y += ax25.h |
| 63 | 63 | header-y += b1lli.h |
| 64 | 64 | header-y += baycom.h |
| 65 | +header-y += bcm933xx_hcs.h | |
| 65 | 66 | header-y += bfs_fs.h |
| 66 | 67 | header-y += binfmts.h |
| 67 | 68 | header-y += blkpg.h |
| @@ -261,6 +262,7 @@ header-y += net_dropmon.h · 193 unmodified lines | ||
| 261 | 262 | header-y += net_tstamp.h |
| 262 | 263 | header-y += netconf.h |
| 263 | 264 | header-y += netdevice.h |
| 265 | +header-y += netlink_diag.h | |
| 264 | 266 | header-y += netfilter.h |
| 265 | 267 | header-y += netfilter_arp.h |
| 266 | 268 | header-y += netfilter_bridge.h |
| @@ -0,0 +1,24 @@ | ||
| 1 | +/* | |
| 2 | + * Broadcom Cable Modem firmware format | |
| 3 | + */ | |
| 4 | + | |
| 5 | +#ifndef __BCM933XX_HCS_H | |
| 6 | +#define __BCM933XX_HCS_H | |
| 7 | + | |
| 8 | +#include <linux/types.h> | |
| 9 | + | |
| 10 | +struct bcm_hcs { | |
| 11 | + __u16 magic; | |
| 12 | + __u16 control; | |
| 13 | + __u16 rev_maj; | |
| 14 | + __u16 rev_min; | |
| 15 | + __u32 build_date; | |
| 16 | + __u32 filelen; | |
| 17 | + __u32 ldaddress; | |
| 18 | + char filename[64]; | |
| 19 | + __u16 hcs; | |
| 20 | + __u16 her_znaet_chto; | |
| 21 | + __u32 crc; | |
| 22 | +}; | |
| 23 | + | |
| 24 | +#endif /* __BCM933XX_HCS */ | |
| @@ -447,6 +447,46 @@ struct btrfs_ioctl_send_args { · 446 unmodified lines | ||
| 447 | 447 | __u64 reserved[4]; /* in */ |
| 448 | 448 | }; |
| 449 | 449 | |
| 450 | +/* Error codes as returned by the kernel */ | |
| 451 | +enum btrfs_err_code { | |
| 452 | + notused, | |
| 453 | + BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET, | |
| 454 | + BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET, | |
| 455 | + BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET, | |
| 456 | + BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET, | |
| 457 | + BTRFS_ERROR_DEV_TGT_REPLACE, | |
| 458 | + BTRFS_ERROR_DEV_MISSING_NOT_FOUND, | |
| 459 | + BTRFS_ERROR_DEV_ONLY_WRITABLE, | |
| 460 | + BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS | |
| 461 | +}; | |
| 462 | +/* An error code to error string mapping for the kernel | |
| 463 | +* error codes | |
| 464 | +*/ | |
| 465 | +static inline char *btrfs_err_str(enum btrfs_err_code err_code) | |
| 466 | +{ | |
| 467 | + switch (err_code) { | |
| 468 | + case BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET: | |
| 469 | + return "unable to go below two devices on raid1"; | |
| 470 | + case BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET: | |
| 471 | + return "unable to go below four devices on raid10"; | |
| 472 | + case BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET: | |
| 473 | + return "unable to go below two devices on raid5"; | |
| 474 | + case BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET: | |
| 475 | + return "unable to go below three devices on raid6"; | |
| 476 | + case BTRFS_ERROR_DEV_TGT_REPLACE: | |
| 477 | + return "unable to remove the dev_replace target dev"; | |
| 478 | + case BTRFS_ERROR_DEV_MISSING_NOT_FOUND: | |
| 479 | + return "no missing devices found to remove"; | |
| 480 | + case BTRFS_ERROR_DEV_ONLY_WRITABLE: | |
| 481 | + return "unable to remove the only writeable device"; | |
| 482 | + case BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS: | |
| 483 | + return "add/delete/balance/replace/resize operation "\ | |
| 484 | + "in progress"; | |
| 485 | + default: | |
| 486 | + return NULL; | |
| 487 | + } | |
| 488 | +} | |
| 489 | + | |
| 450 | 490 | #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \ |
| 451 | 491 | struct btrfs_ioctl_vol_args) |
| 452 | 492 | #define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \ |
| @@ -530,6 +570,7 @@ struct btrfs_ioctl_send_args { · 77 unmodified lines | ||
| 530 | 570 | struct btrfs_ioctl_quota_rescan_args) |
| 531 | 571 | #define BTRFS_IOC_QUOTA_RESCAN_STATUS _IOR(BTRFS_IOCTL_MAGIC, 45, \ |
| 532 | 572 | struct btrfs_ioctl_quota_rescan_args) |
| 573 | +#define BTRFS_IOC_QUOTA_RESCAN_WAIT _IO(BTRFS_IOCTL_MAGIC, 46) | |
| 533 | 574 | #define BTRFS_IOC_GET_FSLABEL _IOR(BTRFS_IOCTL_MAGIC, 49, \ |
| 534 | 575 | char[BTRFS_LABEL_SIZE]) |
| 535 | 576 | #define BTRFS_IOC_SET_FSLABEL _IOW(BTRFS_IOCTL_MAGIC, 50, \ |
| @@ -538,5 +579,4 @@ struct btrfs_ioctl_send_args { · 2 unmodified lines | ||
| 538 | 579 | struct btrfs_ioctl_get_dev_stats) |
| 539 | 580 | #define BTRFS_IOC_DEV_REPLACE _IOWR(BTRFS_IOCTL_MAGIC, 53, \ |
| 540 | 581 | struct btrfs_ioctl_dev_replace_args) |
| 541 | − | |
| 542 | 582 | #endif /* _UAPI_LINUX_BTRFS_H */ |
| @@ -21,4 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | #define _AT(T,X) ((T)(X)) |
| 22 | 22 | #endif |
| 23 | 23 | |
| 24 | +#define _BITUL(x) (_AC(1,UL) << (x)) | |
| 25 | +#define _BITULL(x) (_AC(1,ULL) << (x)) | |
| 26 | + | |
| 24 | 27 | #endif /* !(_LINUX_CONST_H) */ |
| @@ -267,9 +267,9 @@ enum { · 266 unmodified lines | ||
| 267 | 267 | #define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl) |
| 268 | 268 | |
| 269 | 269 | #define DM_VERSION_MAJOR 4 |
| 270 | −#define DM_VERSION_MINOR 24 | |
| 270 | +#define DM_VERSION_MINOR 25 | |
| 271 | 271 | #define DM_VERSION_PATCHLEVEL 0 |
| 272 | −#define DM_VERSION_EXTRA "-ioctl (2013-01-15)" | |
| 272 | +#define DM_VERSION_EXTRA "-ioctl (2013-06-26)" | |
| 273 | 273 | |
| 274 | 274 | /* Status bits */ |
| 275 | 275 | #define DM_READONLY_FLAG (1 << 0) /* In/Out */ |
| @@ -993,8 +993,8 @@ enum ethtool_sfeatures_retval_bits { · 992 unmodified lines | ||
| 993 | 993 | #define PORT_OTHER 0xff |
| 994 | 994 | |
| 995 | 995 | /* Which transceiver to use. */ |
| 996 | −#define XCVR_INTERNAL 0x00 | |
| 997 | −#define XCVR_EXTERNAL 0x01 | |
| 996 | +#define XCVR_INTERNAL 0x00 /* PHY and MAC are in the same package */ | |
| 997 | +#define XCVR_EXTERNAL 0x01 /* PHY and MAC are in different packages */ | |
| 998 | 998 | #define XCVR_DUMMY1 0x02 |
| 999 | 999 | #define XCVR_DUMMY2 0x03 |
| 1000 | 1000 | #define XCVR_DUMMY3 0x04 |
| @@ -9,6 +9,7 @@ enum { · 8 unmodified lines | ||
| 9 | 9 | TCA_STATS_RATE_EST, |
| 10 | 10 | TCA_STATS_QUEUE, |
| 11 | 11 | TCA_STATS_APP, |
| 12 | + TCA_STATS_RATE_EST64, | |
| 12 | 13 | __TCA_STATS_MAX, |
| 13 | 14 | }; |
| 14 | 15 | #define TCA_STATS_MAX (__TCA_STATS_MAX - 1) |
| @@ -37,6 +38,16 @@ struct gnet_stats_rate_est { · 22 unmodified lines | ||
| 37 | 38 | __u32 pps; |
| 38 | 39 | }; |
| 39 | 40 | |
| 41 | +/** | |
| 42 | + * struct gnet_stats_rate_est64 - rate estimator | |
| 43 | + * @bps: current byte rate | |
| 44 | + * @pps: current packet rate | |
| 45 | + */ | |
| 46 | +struct gnet_stats_rate_est64 { | |
| 47 | + __u64 bps; | |
| 48 | + __u64 pps; | |
| 49 | +}; | |
| 50 | + | |
| 40 | 51 | /** |
| 41 | 52 | * struct gnet_stats_queue - queuing statistics |
| 42 | 53 | * @qlen: queue length |
| @@ -93,6 +93,7 @@ · 92 unmodified lines | ||
| 93 | 93 | #define ARPHRD_PHONET_PIPE 821 /* PhoNet pipe header */ |
| 94 | 94 | #define ARPHRD_CAIF 822 /* CAIF media type */ |
| 95 | 95 | #define ARPHRD_IP6GRE 823 /* GRE over IPv6 */ |
| 96 | +#define ARPHRD_NETLINK 824 /* Netlink header */ | |
| 96 | 97 | |
| 97 | 98 | #define ARPHRD_VOID 0xFFFF /* Void type, nothing is known */ |
| 98 | 99 | #define ARPHRD_NONE 0xFFFE /* zero header length */ |
| @@ -221,6 +221,8 @@ enum { · 220 unmodified lines | ||
| 221 | 221 | IFLA_BRPORT_GUARD, /* bpdu guard */ |
| 222 | 222 | IFLA_BRPORT_PROTECT, /* root port protection */ |
| 223 | 223 | IFLA_BRPORT_FAST_LEAVE, /* multicast fast leave */ |
| 224 | + IFLA_BRPORT_LEARNING, /* mac learning */ | |
| 225 | + IFLA_BRPORT_UNICAST_FLOOD, /* flood unicast traffic */ | |
| 224 | 226 | __IFLA_BRPORT_MAX |
| 225 | 227 | }; |
| 226 | 228 | #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) |
| @@ -336,6 +338,7 @@ enum { · 109 unmodified lines | ||
| 336 | 338 | IFLA_VF_VLAN, |
| 337 | 339 | IFLA_VF_TX_RATE, /* TX Bandwidth Allocation */ |
| 338 | 340 | IFLA_VF_SPOOFCHK, /* Spoof Checking on/off switch */ |
| 341 | + IFLA_VF_LINK_STATE, /* link state enable/disable/auto switch */ | |
| 339 | 342 | __IFLA_VF_MAX, |
| 340 | 343 | }; |
| 341 | 344 | |
| @@ -362,6 +365,18 @@ struct ifla_vf_spoofchk { · 20 unmodified lines | ||
| 362 | 365 | __u32 setting; |
| 363 | 366 | }; |
| 364 | 367 | |
| 368 | +enum { | |
| 369 | + IFLA_VF_LINK_STATE_AUTO, /* link state of the uplink */ | |
| 370 | + IFLA_VF_LINK_STATE_ENABLE, /* link always up */ | |
| 371 | + IFLA_VF_LINK_STATE_DISABLE, /* link always down */ | |
| 372 | + __IFLA_VF_LINK_STATE_MAX, | |
| 373 | +}; | |
| 374 | + | |
| 375 | +struct ifla_vf_link_state { | |
| 376 | + __u32 vf; | |
| 377 | + __u32 link_state; | |
| 378 | +}; | |
| 379 | + | |
| 365 | 380 | /* VF ports management section |
| 366 | 381 | * |
| 367 | 382 | * Nested layout of set/get msg is: |
| @@ -135,11 +135,11 @@ struct pppoe_tag { · 134 unmodified lines | ||
| 135 | 135 | |
| 136 | 136 | struct pppoe_hdr { |
| 137 | 137 | #if defined(__LITTLE_ENDIAN_BITFIELD) |
| 138 | − __u8 ver : 4; | |
| 139 | 138 | __u8 type : 4; |
| 139 | + __u8 ver : 4; | |
| 140 | 140 | #elif defined(__BIG_ENDIAN_BITFIELD) |
| 141 | − __u8 type : 4; | |
| 142 | 141 | __u8 ver : 4; |
| 142 | + __u8 type : 4; | |
| 143 | 143 | #else |
| 144 | 144 | #error "Please fix <asm/byteorder.h>" |
| 145 | 145 | #endif |
| @@ -68,6 +68,8 @@ · 67 unmodified lines | ||
| 68 | 68 | #define IFF_MULTI_QUEUE 0x0100 |
| 69 | 69 | #define IFF_ATTACH_QUEUE 0x0200 |
| 70 | 70 | #define IFF_DETACH_QUEUE 0x0400 |
| 71 | +/* read-only flag */ | |
| 72 | +#define IFF_PERSIST 0x0800 | |
| 71 | 73 | |
| 72 | 74 | /* Features for GSO (TUNSETOFFLOAD). */ |
| 73 | 75 | #define TUN_F_CSUM 0x01 /* You can hand me unchecksummed packets. */ |
| @@ -506,11 +506,15 @@ struct input_keymap_entry { · 505 unmodified lines | ||
| 506 | 506 | #define BTN_DEAD 0x12f |
| 507 | 507 | |
| 508 | 508 | #define BTN_GAMEPAD 0x130 |
| 509 | −#define BTN_A 0x130 | |
| 510 | −#define BTN_B 0x131 | |
| 509 | +#define BTN_SOUTH 0x130 | |
| 510 | +#define BTN_A BTN_SOUTH | |
| 511 | +#define BTN_EAST 0x131 | |
| 512 | +#define BTN_B BTN_EAST | |
| 511 | 513 | #define BTN_C 0x132 |
| 512 | −#define BTN_X 0x133 | |
| 513 | −#define BTN_Y 0x134 | |
| 514 | +#define BTN_NORTH 0x133 | |
| 515 | +#define BTN_X BTN_NORTH | |
| 516 | +#define BTN_WEST 0x134 | |
| 517 | +#define BTN_Y BTN_WEST | |
| 514 | 518 | #define BTN_Z 0x135 |
| 515 | 519 | #define BTN_TL 0x136 |
| 516 | 520 | #define BTN_TR 0x137 |
| @@ -707,6 +711,11 @@ struct input_keymap_entry { · 190 unmodified lines | ||
| 707 | 711 | #define KEY_ATTENDANT_TOGGLE 0x21d /* Attendant call on or off */ |
| 708 | 712 | #define KEY_LIGHTS_TOGGLE 0x21e /* Reading light on or off */ |
| 709 | 713 | |
| 714 | +#define BTN_DPAD_UP 0x220 | |
| 715 | +#define BTN_DPAD_DOWN 0x221 | |
| 716 | +#define BTN_DPAD_LEFT 0x222 | |
| 717 | +#define BTN_DPAD_RIGHT 0x223 | |
| 718 | + | |
| 710 | 719 | #define BTN_TRIGGER_HAPPY 0x2c0 |
| 711 | 720 | #define BTN_TRIGGER_HAPPY1 0x2c0 |
| 712 | 721 | #define BTN_TRIGGER_HAPPY2 0x2c1 |
| @@ -20,6 +20,12 @@ · 19 unmodified lines | ||
| 20 | 20 | #define IP_VS_SVC_F_PERSISTENT 0x0001 /* persistent port */ |
| 21 | 21 | #define IP_VS_SVC_F_HASHED 0x0002 /* hashed entry */ |
| 22 | 22 | #define IP_VS_SVC_F_ONEPACKET 0x0004 /* one-packet scheduling */ |
| 23 | +#define IP_VS_SVC_F_SCHED1 0x0008 /* scheduler flag 1 */ | |
| 24 | +#define IP_VS_SVC_F_SCHED2 0x0010 /* scheduler flag 2 */ | |
| 25 | +#define IP_VS_SVC_F_SCHED3 0x0020 /* scheduler flag 3 */ | |
| 26 | + | |
| 27 | +#define IP_VS_SVC_F_SCHED_SH_FALLBACK IP_VS_SVC_F_SCHED1 /* SH fallback */ | |
| 28 | +#define IP_VS_SVC_F_SCHED_SH_PORT IP_VS_SVC_F_SCHED2 /* SH use port */ | |
| 23 | 29 | |
| 24 | 30 | /* |
| 25 | 31 | * Destination Server Flags |
| @@ -666,6 +666,7 @@ struct kvm_ppc_smmu_info { · 665 unmodified lines | ||
| 666 | 666 | #define KVM_CAP_IRQ_MPIC 90 |
| 667 | 667 | #define KVM_CAP_PPC_RTAS 91 |
| 668 | 668 | #define KVM_CAP_IRQ_XICS 92 |
| 669 | +#define KVM_CAP_ARM_EL1_32BIT 93 | |
| 669 | 670 | |
| 670 | 671 | #ifdef KVM_CAP_IRQ_ROUTING |
| 671 | 672 | |
| @@ -783,6 +784,7 @@ struct kvm_dirty_tlb { · 111 unmodified lines | ||
| 783 | 784 | #define KVM_REG_IA64 0x3000000000000000ULL |
| 784 | 785 | #define KVM_REG_ARM 0x4000000000000000ULL |
| 785 | 786 | #define KVM_REG_S390 0x5000000000000000ULL |
| 787 | +#define KVM_REG_ARM64 0x6000000000000000ULL | |
| 786 | 788 | #define KVM_REG_MIPS 0x7000000000000000ULL |
| 787 | 789 | |
| 788 | 790 | #define KVM_REG_SIZE_SHIFT 52 |
| @@ -104,6 +104,8 @@ struct __fat_dirent { · 103 unmodified lines | ||
| 104 | 104 | /* <linux/videotext.h> has used 0x72 ('r') in collision, so skip a few */ |
| 105 | 105 | #define FAT_IOCTL_GET_ATTRIBUTES _IOR('r', 0x10, __u32) |
| 106 | 106 | #define FAT_IOCTL_SET_ATTRIBUTES _IOW('r', 0x11, __u32) |
| 107 | +/*Android kernel has used 0x12, so we use 0x13*/ | |
| 108 | +#define FAT_IOCTL_GET_VOLUME_ID _IOR('r', 0x13, __u32) | |
| 107 | 109 | |
| 108 | 110 | struct fat_boot_sector { |
| 109 | 111 | __u8 ignored[3]; /* Boot strap short or near jump */ |
| @@ -128,6 +130,10 @@ struct fat_boot_sector { · 18 unmodified lines | ||
| 128 | 130 | __u8 drive_number; /* Physical drive number */ |
| 129 | 131 | __u8 state; /* undocumented, but used |
| 130 | 132 | for mount state. */ |
| 133 | + __u8 signature; /* extended boot signature */ | |
| 134 | + __u8 vol_id[4]; /* volume ID */ | |
| 135 | + __u8 vol_label[11]; /* volume label */ | |
| 136 | + __u8 fs_type[8]; /* file system type */ | |
| 131 | 137 | /* other fiealds are not added here */ |
| 132 | 138 | } fat16; |
| 133 | 139 | |
| @@ -147,6 +153,10 @@ struct fat_boot_sector { · 13 unmodified lines | ||
| 147 | 153 | __u8 drive_number; /* Physical drive number */ |
| 148 | 154 | __u8 state; /* undocumented, but used |
| 149 | 155 | for mount state. */ |
| 156 | + __u8 signature; /* extended boot signature */ | |
| 157 | + __u8 vol_id[4]; /* volume ID */ | |
| 158 | + __u8 vol_label[11]; /* volume label */ | |
| 159 | + __u8 fs_type[8]; /* file system type */ | |
| 150 | 160 | /* other fiealds are not added here */ |
| 151 | 161 | } fat32; |
| 152 | 162 | }; |
| @@ -105,5 +105,7 @@ enum nfqnl_attr_config { · 104 unmodified lines | ||
| 105 | 105 | #define NFQA_SKB_CSUMNOTREADY (1 << 0) |
| 106 | 106 | /* packet is GSO (i.e., exceeds device mtu) */ |
| 107 | 107 | #define NFQA_SKB_GSO (1 << 1) |
| 108 | +/* csum not validated (incoming device doesn't support hw checksum, etc.) */ | |
| 109 | +#define NFQA_SKB_CSUM_NOTVERIFIED (1 << 2) | |
| 108 | 110 | |
| 109 | 111 | #endif /* _NFNETLINK_QUEUE_H */ |
| @@ -5,10 +5,17 @@ · 4 unmodified lines | ||
| 5 | 5 | |
| 6 | 6 | enum { |
| 7 | 7 | XT_SOCKET_TRANSPARENT = 1 << 0, |
| 8 | + XT_SOCKET_NOWILDCARD = 1 << 1, | |
| 8 | 9 | }; |
| 9 | 10 | |
| 10 | 11 | struct xt_socket_mtinfo1 { |
| 11 | 12 | __u8 flags; |
| 12 | 13 | }; |
| 14 | +#define XT_SOCKET_FLAGS_V1 XT_SOCKET_TRANSPARENT | |
| 15 | + | |
| 16 | +struct xt_socket_mtinfo2 { | |
| 17 | + __u8 flags; | |
| 18 | +}; | |
| 19 | +#define XT_SOCKET_FLAGS_V2 (XT_SOCKET_TRANSPARENT | XT_SOCKET_NOWILDCARD) | |
| 13 | 20 | |
| 14 | 21 | #endif /* _XT_SOCKET_H */ |
| @@ -69,6 +69,8 @@ · 68 unmodified lines | ||
| 69 | 69 | * starting a poll from a device which has a secure element enabled means |
| 70 | 70 | * we want to do SE based card emulation. |
| 71 | 71 | * @NFC_CMD_DISABLE_SE: Disable the physical link to a specific secure element. |
| 72 | + * @NFC_CMD_FW_UPLOAD: Request to Load/flash firmware, or event to inform that | |
| 73 | + * some firmware was loaded | |
| 72 | 74 | */ |
| 73 | 75 | enum nfc_commands { |
| 74 | 76 | NFC_CMD_UNSPEC, |
| @@ -92,6 +94,9 @@ enum nfc_commands { · 17 unmodified lines | ||
| 92 | 94 | NFC_CMD_DISABLE_SE, |
| 93 | 95 | NFC_CMD_LLC_SDREQ, |
| 94 | 96 | NFC_EVENT_LLC_SDRES, |
| 97 | + NFC_CMD_FW_UPLOAD, | |
| 98 | + NFC_EVENT_SE_ADDED, | |
| 99 | + NFC_EVENT_SE_REMOVED, | |
| 95 | 100 | /* private: internal use only */ |
| 96 | 101 | __NFC_CMD_AFTER_LAST |
| 97 | 102 | }; |
| @@ -121,6 +126,9 @@ enum nfc_commands { · 23 unmodified lines | ||
| 121 | 126 | * @NFC_ATTR_LLC_PARAM_RW: Receive Window size parameter |
| 122 | 127 | * @NFC_ATTR_LLC_PARAM_MIUX: MIU eXtension parameter |
| 123 | 128 | * @NFC_ATTR_SE: Available Secure Elements |
| 129 | + * @NFC_ATTR_FIRMWARE_NAME: Free format firmware version | |
| 130 | + * @NFC_ATTR_SE_INDEX: Secure element index | |
| 131 | + * @NFC_ATTR_SE_TYPE: Secure element type (UICC or EMBEDDED) | |
| 124 | 132 | */ |
| 125 | 133 | enum nfc_attrs { |
| 126 | 134 | NFC_ATTR_UNSPEC, |
| @@ -143,6 +151,9 @@ enum nfc_attrs { · 16 unmodified lines | ||
| 143 | 151 | NFC_ATTR_LLC_PARAM_MIUX, |
| 144 | 152 | NFC_ATTR_SE, |
| 145 | 153 | NFC_ATTR_LLC_SDP, |
| 154 | + NFC_ATTR_FIRMWARE_NAME, | |
| 155 | + NFC_ATTR_SE_INDEX, | |
| 156 | + NFC_ATTR_SE_TYPE, | |
| 146 | 157 | /* private: internal use only */ |
| 147 | 158 | __NFC_ATTR_AFTER_LAST |
| 148 | 159 | }; |
| @@ -159,9 +170,12 @@ enum nfc_sdp_attr { · 10 unmodified lines | ||
| 159 | 170 | |
| 160 | 171 | #define NFC_DEVICE_NAME_MAXSIZE 8 |
| 161 | 172 | #define NFC_NFCID1_MAXSIZE 10 |
| 173 | +#define NFC_NFCID2_MAXSIZE 8 | |
| 174 | +#define NFC_NFCID3_MAXSIZE 10 | |
| 162 | 175 | #define NFC_SENSB_RES_MAXSIZE 12 |
| 163 | 176 | #define NFC_SENSF_RES_MAXSIZE 18 |
| 164 | 177 | #define NFC_GB_MAXSIZE 48 |
| 178 | +#define NFC_FIRMWARE_NAME_MAXSIZE 32 | |
| 165 | 179 | |
| 166 | 180 | /* NFC protocols */ |
| 167 | 181 | #define NFC_PROTO_JEWEL 1 |
| @@ -191,10 +205,12 @@ enum nfc_sdp_attr { · 23 unmodified lines | ||
| 191 | 205 | #define NFC_PROTO_ISO14443_B_MASK (1 << NFC_PROTO_ISO14443_B) |
| 192 | 206 | |
| 193 | 207 | /* NFC Secure Elements */ |
| 194 | −#define NFC_SE_NONE 0x0 | |
| 195 | 208 | #define NFC_SE_UICC 0x1 |
| 196 | 209 | #define NFC_SE_EMBEDDED 0x2 |
| 197 | 210 | |
| 211 | +#define NFC_SE_DISABLED 0x0 | |
| 212 | +#define NFC_SE_ENABLED 0x1 | |
| 213 | + | |
| 198 | 214 | struct sockaddr_nfc { |
| 199 | 215 | sa_family_t sa_family; |
| 200 | 216 | __u32 dev_idx; |
| @@ -27,6 +27,8 @@ · 26 unmodified lines | ||
| 27 | 27 | |
| 28 | 28 | #include <linux/types.h> |
| 29 | 29 | |
| 30 | +#define NL80211_GENL_NAME "nl80211" | |
| 31 | + | |
| 30 | 32 | /** |
| 31 | 33 | * DOC: Station handling |
| 32 | 34 | * |
| @@ -1429,6 +1431,11 @@ enum nl80211_commands { · 1396 unmodified lines | ||
| 1429 | 1431 | * @NL80211_ATTR_MAX_CRIT_PROT_DURATION: duration in milliseconds in which |
| 1430 | 1432 | * the connection should have increased reliability (u16). |
| 1431 | 1433 | * |
| 1434 | + * @NL80211_ATTR_PEER_AID: Association ID for the peer TDLS station (u16). | |
| 1435 | + * This is similar to @NL80211_ATTR_STA_AID but with a difference of being | |
| 1436 | + * allowed to be used with the first @NL80211_CMD_SET_STATION command to | |
| 1437 | + * update a TDLS peer STA entry. | |
| 1438 | + * | |
| 1432 | 1439 | * @NL80211_ATTR_MAX: highest attribute number currently defined |
| 1433 | 1440 | * @__NL80211_ATTR_AFTER_LAST: internal use |
| 1434 | 1441 | */ |
| @@ -1727,6 +1734,8 @@ enum nl80211_attrs { · 292 unmodified lines | ||
| 1727 | 1734 | NL80211_ATTR_CRIT_PROT_ID, |
| 1728 | 1735 | NL80211_ATTR_MAX_CRIT_PROT_DURATION, |
| 1729 | 1736 | |
| 1737 | + NL80211_ATTR_PEER_AID, | |
| 1738 | + | |
| 1730 | 1739 | /* add attributes here, update the policy in nl80211.c */ |
| 1731 | 1740 | |
| 1732 | 1741 | __NL80211_ATTR_AFTER_LAST, |
| @@ -1991,6 +2000,10 @@ enum nl80211_sta_bss_param { · 258 unmodified lines | ||
| 1991 | 2000 | * @NL80211_STA_INFO_PEER_PM: peer mesh STA link-specific power mode |
| 1992 | 2001 | * @NL80211_STA_INFO_NONPEER_PM: neighbor mesh STA power save mode towards |
| 1993 | 2002 | * non-peer STA |
| 2003 | + * @NL80211_STA_INFO_CHAIN_SIGNAL: per-chain signal strength of last PPDU | |
| 2004 | + * Contains a nested array of signal strength attributes (u8, dBm) | |
| 2005 | + * @NL80211_STA_INFO_CHAIN_SIGNAL_AVG: per-chain signal strength average | |
| 2006 | + * Same format as NL80211_STA_INFO_CHAIN_SIGNAL. | |
| 1994 | 2007 | * @__NL80211_STA_INFO_AFTER_LAST: internal |
| 1995 | 2008 | * @NL80211_STA_INFO_MAX: highest possible station info attribute |
| 1996 | 2009 | */ |
| @@ -2020,6 +2033,8 @@ enum nl80211_sta_info { · 23 unmodified lines | ||
| 2020 | 2033 | NL80211_STA_INFO_NONPEER_PM, |
| 2021 | 2034 | NL80211_STA_INFO_RX_BYTES64, |
| 2022 | 2035 | NL80211_STA_INFO_TX_BYTES64, |
| 2036 | + NL80211_STA_INFO_CHAIN_SIGNAL, | |
| 2037 | + NL80211_STA_INFO_CHAIN_SIGNAL_AVG, | |
| 2023 | 2038 | |
| 2024 | 2039 | /* keep last */ |
| 2025 | 2040 | __NL80211_STA_INFO_AFTER_LAST, |
| @@ -2413,6 +2428,8 @@ enum nl80211_survey_info { · 387 unmodified lines | ||
| 2413 | 2428 | * @NL80211_MNTR_FLAG_OTHER_BSS: disable BSSID filtering |
| 2414 | 2429 | * @NL80211_MNTR_FLAG_COOK_FRAMES: report frames after processing. |
| 2415 | 2430 | * overrides all other flags. |
| 2431 | + * @NL80211_MNTR_FLAG_ACTIVE: use the configured MAC address | |
| 2432 | + * and ACK incoming unicast packets. | |
| 2416 | 2433 | * |
| 2417 | 2434 | * @__NL80211_MNTR_FLAG_AFTER_LAST: internal use |
| 2418 | 2435 | * @NL80211_MNTR_FLAG_MAX: highest possible monitor flag |
| @@ -2424,6 +2441,7 @@ enum nl80211_mntr_flags { · 5 unmodified lines | ||
| 2424 | 2441 | NL80211_MNTR_FLAG_CONTROL, |
| 2425 | 2442 | NL80211_MNTR_FLAG_OTHER_BSS, |
| 2426 | 2443 | NL80211_MNTR_FLAG_COOK_FRAMES, |
| 2444 | + NL80211_MNTR_FLAG_ACTIVE, | |
| 2427 | 2445 | |
| 2428 | 2446 | /* keep last */ |
| 2429 | 2447 | __NL80211_MNTR_FLAG_AFTER_LAST, |
| @@ -2559,6 +2577,10 @@ enum nl80211_mesh_power_mode { · 129 unmodified lines | ||
| 2559 | 2577 | * |
| 2560 | 2578 | * @NL80211_MESHCONF_AWAKE_WINDOW: awake window duration (in TUs) |
| 2561 | 2579 | * |
| 2580 | + * @NL80211_MESHCONF_PLINK_TIMEOUT: If no tx activity is seen from a STA we've | |
| 2581 | + * established peering with for longer than this time (in seconds), then | |
| 2582 | + * remove it from the STA's list of peers. Default is 30 minutes. | |
| 2583 | + * | |
| 2562 | 2584 | * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use |
| 2563 | 2585 | */ |
| 2564 | 2586 | enum nl80211_meshconf_params { |
| @@ -2590,6 +2612,7 @@ enum nl80211_meshconf_params { · 25 unmodified lines | ||
| 2590 | 2612 | NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL, |
| 2591 | 2613 | NL80211_MESHCONF_POWER_MODE, |
| 2592 | 2614 | NL80211_MESHCONF_AWAKE_WINDOW, |
| 2615 | + NL80211_MESHCONF_PLINK_TIMEOUT, | |
| 2593 | 2616 | |
| 2594 | 2617 | /* keep last */ |
| 2595 | 2618 | __NL80211_MESHCONF_ATTR_AFTER_LAST, |
| @@ -2637,6 +2660,10 @@ enum nl80211_meshconf_params { · 41 unmodified lines | ||
| 2637 | 2660 | * @NL80211_MESH_SETUP_USERSPACE_MPM: Enable this option if userspace will |
| 2638 | 2661 | * implement an MPM which handles peer allocation and state. |
| 2639 | 2662 | * |
| 2663 | + * @NL80211_MESH_SETUP_AUTH_PROTOCOL: Inform the kernel of the authentication | |
| 2664 | + * method (u8, as defined in IEEE 8.4.2.100.6, e.g. 0x1 for SAE). | |
| 2665 | + * Default is no authentication method required. | |
| 2666 | + * | |
| 2640 | 2667 | * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number |
| 2641 | 2668 | * |
| 2642 | 2669 | * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use |
| @@ -2650,6 +2677,7 @@ enum nl80211_mesh_setup_params { · 7 unmodified lines | ||
| 2650 | 2677 | NL80211_MESH_SETUP_USERSPACE_AMPE, |
| 2651 | 2678 | NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC, |
| 2652 | 2679 | NL80211_MESH_SETUP_USERSPACE_MPM, |
| 2680 | + NL80211_MESH_SETUP_AUTH_PROTOCOL, | |
| 2653 | 2681 | |
| 2654 | 2682 | /* keep last */ |
| 2655 | 2683 | __NL80211_MESH_SETUP_ATTR_AFTER_LAST, |
| @@ -2730,6 +2758,8 @@ enum nl80211_channel_type { · 74 unmodified lines | ||
| 2730 | 2758 | * and %NL80211_ATTR_CENTER_FREQ2 attributes must be provided as well |
| 2731 | 2759 | * @NL80211_CHAN_WIDTH_160: 160 MHz channel, the %NL80211_ATTR_CENTER_FREQ1 |
| 2732 | 2760 | * attribute must be provided as well |
| 2761 | + * @NL80211_CHAN_WIDTH_5: 5 MHz OFDM channel | |
| 2762 | + * @NL80211_CHAN_WIDTH_10: 10 MHz OFDM channel | |
| 2733 | 2763 | */ |
| 2734 | 2764 | enum nl80211_chan_width { |
| 2735 | 2765 | NL80211_CHAN_WIDTH_20_NOHT, |
| @@ -2738,6 +2768,8 @@ enum nl80211_chan_width { · 2 unmodified lines | ||
| 2738 | 2768 | NL80211_CHAN_WIDTH_80, |
| 2739 | 2769 | NL80211_CHAN_WIDTH_80P80, |
| 2740 | 2770 | NL80211_CHAN_WIDTH_160, |
| 2771 | + NL80211_CHAN_WIDTH_5, | |
| 2772 | + NL80211_CHAN_WIDTH_10, | |
| 2741 | 2773 | }; |
| 2742 | 2774 | |
| 2743 | 2775 | /** |
| @@ -3556,6 +3588,10 @@ enum nl80211_ap_sme_features { · 812 unmodified lines | ||
| 3556 | 3588 | * Peering Management entity which may be implemented by registering for |
| 3557 | 3589 | * beacons or NL80211_CMD_NEW_PEER_CANDIDATE events. The mesh beacon is |
| 3558 | 3590 | * still generated by the driver. |
| 3591 | + * @NL80211_FEATURE_ACTIVE_MONITOR: This driver supports an active monitor | |
| 3592 | + * interface. An active monitor interface behaves like a normal monitor | |
| 3593 | + * interface, but gets added to the driver. It ensures that incoming | |
| 3594 | + * unicast packets directed at the configured interface address get ACKed. | |
| 3559 | 3595 | */ |
| 3560 | 3596 | enum nl80211_feature_flags { |
| 3561 | 3597 | NL80211_FEATURE_SK_TX_STATUS = 1 << 0, |
| @@ -3575,6 +3611,7 @@ enum nl80211_feature_flags { · 13 unmodified lines | ||
| 3575 | 3611 | NL80211_FEATURE_ADVERTISE_CHAN_LIMITS = 1 << 14, |
| 3576 | 3612 | NL80211_FEATURE_FULL_AP_CLIENT_STATE = 1 << 15, |
| 3577 | 3613 | NL80211_FEATURE_USERSPACE_MPM = 1 << 16, |
| 3614 | + NL80211_FEATURE_ACTIVE_MONITOR = 1 << 17, | |
| 3578 | 3615 | }; |
| 3579 | 3616 | |
| 3580 | 3617 | /** |
| @@ -164,6 +164,7 @@ enum ovs_vport_type { · 163 unmodified lines | ||
| 164 | 164 | OVS_VPORT_TYPE_UNSPEC, |
| 165 | 165 | OVS_VPORT_TYPE_NETDEV, /* network device */ |
| 166 | 166 | OVS_VPORT_TYPE_INTERNAL, /* network device implemented by datapath */ |
| 167 | + OVS_VPORT_TYPE_GRE, /* GRE tunnel. */ | |
| 167 | 168 | __OVS_VPORT_TYPE_MAX |
| 168 | 169 | }; |
| 169 | 170 | |
| @@ -192,7 +193,6 @@ enum ovs_vport_type { · 22 unmodified lines | ||
| 192 | 193 | * optional; if not specified a free port number is automatically selected. |
| 193 | 194 | * Whether %OVS_VPORT_ATTR_OPTIONS is required or optional depends on the type |
| 194 | 195 | * of vport. |
| 195 | − * and other attributes are ignored. | |
| 196 | 196 | * |
| 197 | 197 | * For other requests, if %OVS_VPORT_ATTR_NAME is specified then it is used to |
| 198 | 198 | * look up the vport to operate on; otherwise dp_idx from the &struct |
| @@ -247,11 +247,29 @@ enum ovs_key_attr { · 48 unmodified lines | ||
| 247 | 247 | OVS_KEY_ATTR_ARP, /* struct ovs_key_arp */ |
| 248 | 248 | OVS_KEY_ATTR_ND, /* struct ovs_key_nd */ |
| 249 | 249 | OVS_KEY_ATTR_SKB_MARK, /* u32 skb mark */ |
| 250 | + OVS_KEY_ATTR_TUNNEL, /* Nested set of ovs_tunnel attributes */ | |
| 251 | + | |
| 252 | +#ifdef __KERNEL__ | |
| 253 | + OVS_KEY_ATTR_IPV4_TUNNEL, /* struct ovs_key_ipv4_tunnel */ | |
| 254 | +#endif | |
| 250 | 255 | __OVS_KEY_ATTR_MAX |
| 251 | 256 | }; |
| 252 | 257 | |
| 253 | 258 | #define OVS_KEY_ATTR_MAX (__OVS_KEY_ATTR_MAX - 1) |
| 254 | 259 | |
| 260 | +enum ovs_tunnel_key_attr { | |
| 261 | + OVS_TUNNEL_KEY_ATTR_ID, /* be64 Tunnel ID */ | |
| 262 | + OVS_TUNNEL_KEY_ATTR_IPV4_SRC, /* be32 src IP address. */ | |
| 263 | + OVS_TUNNEL_KEY_ATTR_IPV4_DST, /* be32 dst IP address. */ | |
| 264 | + OVS_TUNNEL_KEY_ATTR_TOS, /* u8 Tunnel IP ToS. */ | |
| 265 | + OVS_TUNNEL_KEY_ATTR_TTL, /* u8 Tunnel IP TTL. */ | |
| 266 | + OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT, /* No argument, set DF. */ | |
| 267 | + OVS_TUNNEL_KEY_ATTR_CSUM, /* No argument. CSUM packet. */ | |
| 268 | + __OVS_TUNNEL_KEY_ATTR_MAX | |
| 269 | +}; | |
| 270 | + | |
| 271 | +#define OVS_TUNNEL_KEY_ATTR_MAX (__OVS_TUNNEL_KEY_ATTR_MAX - 1) | |
| 272 | + | |
| 255 | 273 | /** |
| 256 | 274 | * enum ovs_frag_type - IPv4 and IPv6 fragment type |
| 257 | 275 | * @OVS_FRAG_TYPE_NONE: Packet is not a fragment. |
| @@ -468,7 +468,7 @@ · 467 unmodified lines | ||
| 468 | 468 | #define PCI_EXP_LNKCAP_ASPMS 0x00000c00 /* ASPM Support */ |
| 469 | 469 | #define PCI_EXP_LNKCAP_L0SEL 0x00007000 /* L0s Exit Latency */ |
| 470 | 470 | #define PCI_EXP_LNKCAP_L1EL 0x00038000 /* L1 Exit Latency */ |
| 471 | −#define PCI_EXP_LNKCAP_CLKPM 0x00040000 /* L1 Clock Power Management */ | |
| 471 | +#define PCI_EXP_LNKCAP_CLKPM 0x00040000 /* Clock Power Management */ | |
| 472 | 472 | #define PCI_EXP_LNKCAP_SDERC 0x00080000 /* Surprise Down Error Reporting Capable */ |
| 473 | 473 | #define PCI_EXP_LNKCAP_DLLLARC 0x00100000 /* Data Link Layer Link Active Reporting Capable */ |
| 474 | 474 | #define PCI_EXP_LNKCAP_LBNC 0x00200000 /* Link Bandwidth Notification Capability */ |
| @@ -157,8 +157,11 @@ enum perf_branch_sample_type { · 156 unmodified lines | ||
| 157 | 157 | PERF_SAMPLE_BRANCH_ANY_CALL = 1U << 4, /* any call branch */ |
| 158 | 158 | PERF_SAMPLE_BRANCH_ANY_RETURN = 1U << 5, /* any return branch */ |
| 159 | 159 | PERF_SAMPLE_BRANCH_IND_CALL = 1U << 6, /* indirect calls */ |
| 160 | + PERF_SAMPLE_BRANCH_ABORT_TX = 1U << 7, /* transaction aborts */ | |
| 161 | + PERF_SAMPLE_BRANCH_IN_TX = 1U << 8, /* in transaction */ | |
| 162 | + PERF_SAMPLE_BRANCH_NO_TX = 1U << 9, /* not in transaction */ | |
| 160 | 163 | |
| 161 | − PERF_SAMPLE_BRANCH_MAX = 1U << 7, /* non-ABI */ | |
| 164 | + PERF_SAMPLE_BRANCH_MAX = 1U << 10, /* non-ABI */ | |
| 162 | 165 | }; |
| 163 | 166 | |
| 164 | 167 | #define PERF_SAMPLE_BRANCH_PLM_ALL \ |
| @@ -61,6 +61,9 @@ struct ptrace_peeksiginfo_args { · 60 unmodified lines | ||
| 61 | 61 | __s32 nr; /* how may siginfos to take */ |
| 62 | 62 | }; |
| 63 | 63 | |
| 64 | +#define PTRACE_GETSIGMASK 0x420a | |
| 65 | +#define PTRACE_SETSIGMASK 0x420b | |
| 66 | + | |
| 64 | 67 | /* Read signals from a shared (process wide) queue */ |
| 65 | 68 | #define PTRACE_PEEKSIGINFO_SHARED (1 << 0) |
| 66 | 69 | |
| @@ -386,6 +386,8 @@ enum { · 385 unmodified lines | ||
| 386 | 386 | #define RTAX_RTO_MIN RTAX_RTO_MIN |
| 387 | 387 | RTAX_INITRWND, |
| 388 | 388 | #define RTAX_INITRWND RTAX_INITRWND |
| 389 | + RTAX_QUICKACK, | |
| 390 | +#define RTAX_QUICKACK RTAX_QUICKACK | |
| 389 | 391 | __RTAX_MAX |
| 390 | 392 | }; |
| 391 | 393 | |
| @@ -226,4 +226,10 @@ · 225 unmodified lines | ||
| 226 | 226 | /* Rocketport EXPRESS/INFINITY */ |
| 227 | 227 | #define PORT_RP2 102 |
| 228 | 228 | |
| 229 | +/* Freescale lpuart */ | |
| 230 | +#define PORT_LPUART 103 | |
| 231 | + | |
| 232 | +/* SH-SCI */ | |
| 233 | +#define PORT_HSCIF 104 | |
| 234 | + | |
| 229 | 235 | #endif /* _UAPILINUX_SERIAL_CORE_H */ |
| @@ -253,6 +253,7 @@ enum · 252 unmodified lines | ||
| 253 | 253 | LINUX_MIB_TCPFASTOPENLISTENOVERFLOW, /* TCPFastOpenListenOverflow */ |
| 254 | 254 | LINUX_MIB_TCPFASTOPENCOOKIEREQD, /* TCPFastOpenCookieReqd */ |
| 255 | 255 | LINUX_MIB_TCPSPURIOUS_RTX_HOSTQUEUES, /* TCPSpuriousRtxHostQueues */ |
| 256 | + LINUX_MIB_LOWLATENCYRXPACKETS, /* LowLatencyRxPackets */ | |
| 256 | 257 | __LINUX_MIB_MAX |
| 257 | 258 | }; |
| 258 | 259 | |
| @@ -287,6 +288,7 @@ enum · 28 unmodified lines | ||
| 287 | 288 | LINUX_MIB_XFRMOUTPOLERROR, /* XfrmOutPolError */ |
| 288 | 289 | LINUX_MIB_XFRMFWDHDRERROR, /* XfrmFwdHdrError*/ |
| 289 | 290 | LINUX_MIB_XFRMOUTSTATEINVALID, /* XfrmOutStateInvalid */ |
| 291 | + LINUX_MIB_XFRMACQUIREERROR, /* XfrmAcquireError */ | |
| 290 | 292 | __LINUX_MIB_XFRMMAX |
| 291 | 293 | }; |
| 292 | 294 | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/linux/tipc.h: Include file for TIPC socket interface | |
| 2 | + * include/uapi/linux/tipc.h: Header for TIPC socket interface | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2003-2006, Ericsson AB |
| 5 | 5 | * Copyright (c) 2005, 2010-2011, Wind River Systems |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/linux/tipc_config.h: Include file for TIPC configuration interface | |
| 2 | + * include/uapi/linux/tipc_config.h: Header for TIPC configuration interface | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (c) 2003-2006, Ericsson AB |
| 5 | 5 | * Copyright (c) 2005-2007, 2010-2011, Wind River Systems |
| @@ -53,13 +53,13 @@ · 52 unmodified lines | ||
| 53 | 53 | #define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */ |
| 54 | 54 | #define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */ |
| 55 | 55 | #define V4L2_CTRL_CLASS_CAMERA 0x009a0000 /* Camera class controls */ |
| 56 | −#define V4L2_CTRL_CLASS_FM_TX 0x009b0000 /* FM Modulator control class */ | |
| 56 | +#define V4L2_CTRL_CLASS_FM_TX 0x009b0000 /* FM Modulator controls */ | |
| 57 | 57 | #define V4L2_CTRL_CLASS_FLASH 0x009c0000 /* Camera flash controls */ |
| 58 | 58 | #define V4L2_CTRL_CLASS_JPEG 0x009d0000 /* JPEG-compression controls */ |
| 59 | 59 | #define V4L2_CTRL_CLASS_IMAGE_SOURCE 0x009e0000 /* Image source controls */ |
| 60 | 60 | #define V4L2_CTRL_CLASS_IMAGE_PROC 0x009f0000 /* Image processing controls */ |
| 61 | 61 | #define V4L2_CTRL_CLASS_DV 0x00a00000 /* Digital Video controls */ |
| 62 | −#define V4L2_CTRL_CLASS_FM_RX 0x00a10000 /* Digital Video controls */ | |
| 62 | +#define V4L2_CTRL_CLASS_FM_RX 0x00a10000 /* FM Receiver controls */ | |
| 63 | 63 | |
| 64 | 64 | /* User-class control IDs */ |
| 65 | 65 | |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | /* Extensions */ |
| 23 | 23 | |
| 24 | 24 | #define VFIO_TYPE1_IOMMU 1 |
| 25 | +#define VFIO_SPAPR_TCE_IOMMU 2 | |
| 25 | 26 | |
| 26 | 27 | /* |
| 27 | 28 | * The IOCTL interface is designed for extensibility by embedding the |
| @@ -361,10 +362,14 @@ struct vfio_iommu_type1_dma_map { · 333 unmodified lines | ||
| 361 | 362 | #define VFIO_IOMMU_MAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 13) |
| 362 | 363 | |
| 363 | 364 | /** |
| 364 | − * VFIO_IOMMU_UNMAP_DMA - _IOW(VFIO_TYPE, VFIO_BASE + 14, struct vfio_dma_unmap) | |
| 365 | + * VFIO_IOMMU_UNMAP_DMA - _IOWR(VFIO_TYPE, VFIO_BASE + 14, | |
| 366 | + * struct vfio_dma_unmap) | |
| 365 | 367 | * |
| 366 | 368 | * Unmap IO virtual addresses using the provided struct vfio_dma_unmap. |
| 367 | − * Caller sets argsz. | |
| 369 | + * Caller sets argsz. The actual unmapped size is returned in the size | |
| 370 | + * field. No guarantee is made to the user that arbitrary unmaps of iova | |
| 371 | + * or size different from those used in the original mapping call will | |
| 372 | + * succeed. | |
| 368 | 373 | */ |
| 369 | 374 | struct vfio_iommu_type1_dma_unmap { |
| 370 | 375 | __u32 argsz; |
| @@ -375,4 +380,37 @@ struct vfio_iommu_type1_dma_unmap { · 4 unmodified lines | ||
| 375 | 380 | |
| 376 | 381 | #define VFIO_IOMMU_UNMAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 14) |
| 377 | 382 | |
| 383 | +/* | |
| 384 | + * IOCTLs to enable/disable IOMMU container usage. | |
| 385 | + * No parameters are supported. | |
| 386 | + */ | |
| 387 | +#define VFIO_IOMMU_ENABLE _IO(VFIO_TYPE, VFIO_BASE + 15) | |
| 388 | +#define VFIO_IOMMU_DISABLE _IO(VFIO_TYPE, VFIO_BASE + 16) | |
| 389 | + | |
| 390 | +/* -------- Additional API for SPAPR TCE (Server POWERPC) IOMMU -------- */ | |
| 391 | + | |
| 392 | +/* | |
| 393 | + * The SPAPR TCE info struct provides the information about the PCI bus | |
| 394 | + * address ranges available for DMA, these values are programmed into | |
| 395 | + * the hardware so the guest has to know that information. | |
| 396 | + * | |
| 397 | + * The DMA 32 bit window start is an absolute PCI bus address. | |
| 398 | + * The IOVA address passed via map/unmap ioctls are absolute PCI bus | |
| 399 | + * addresses too so the window works as a filter rather than an offset | |
| 400 | + * for IOVA addresses. | |
| 401 | + * | |
| 402 | + * A flag will need to be added if other page sizes are supported, | |
| 403 | + * so as defined here, it is always 4k. | |
| 404 | + */ | |
| 405 | +struct vfio_iommu_spapr_tce_info { | |
| 406 | + __u32 argsz; | |
| 407 | + __u32 flags; /* reserved for future use */ | |
| 408 | + __u32 dma32_window_start; /* 32 bit window start (bytes) */ | |
| 409 | + __u32 dma32_window_size; /* 32 bit window size (bytes) */ | |
| 410 | +}; | |
| 411 | + | |
| 412 | +#define VFIO_IOMMU_SPAPR_TCE_GET_INFO _IO(VFIO_TYPE, VFIO_BASE + 12) | |
| 413 | + | |
| 414 | +/* ***************************************************************** */ | |
| 415 | + | |
| 378 | 416 | #endif /* _UAPIVFIO_H */ |
| @@ -395,7 +395,7 @@ struct v4l2_pix_format { · 394 unmodified lines | ||
| 395 | 395 | #define V4L2_PIX_FMT_H263 v4l2_fourcc('H', '2', '6', '3') /* H263 */ |
| 396 | 396 | #define V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES */ |
| 397 | 397 | #define V4L2_PIX_FMT_MPEG2 v4l2_fourcc('M', 'P', 'G', '2') /* MPEG-2 ES */ |
| 398 | −#define V4L2_PIX_FMT_MPEG4 v4l2_fourcc('M', 'P', 'G', '4') /* MPEG-4 ES */ | |
| 398 | +#define V4L2_PIX_FMT_MPEG4 v4l2_fourcc('M', 'P', 'G', '4') /* MPEG-4 part 2 ES */ | |
| 399 | 399 | #define V4L2_PIX_FMT_XVID v4l2_fourcc('X', 'V', 'I', 'D') /* Xvid */ |
| 400 | 400 | #define V4L2_PIX_FMT_VC1_ANNEX_G v4l2_fourcc('V', 'C', '1', 'G') /* SMPTE 421M Annex G compliant stream */ |
| 401 | 401 | #define V4L2_PIX_FMT_VC1_ANNEX_L v4l2_fourcc('V', 'C', '1', 'L') /* SMPTE 421M Annex L compliant stream */ |
| @@ -555,7 +555,7 @@ struct v4l2_jpegcompression { · 153 unmodified lines | ||
| 555 | 555 | __u32 jpeg_markers; /* Which markers should go into the JPEG |
| 556 | 556 | * output. Unless you exactly know what |
| 557 | 557 | * you do, leave them untouched. |
| 558 | − * Inluding less markers will make the | |
| 558 | + * Including less markers will make the | |
| 559 | 559 | * resulting code smaller, but there will |
| 560 | 560 | * be fewer applications which can read it. |
| 561 | 561 | * The presence of the APP and COM marker |
| @@ -567,7 +567,7 @@ struct v4l2_jpegcompression { · 5 unmodified lines | ||
| 567 | 567 | #define V4L2_JPEG_MARKER_DRI (1<<5) /* Define Restart Interval */ |
| 568 | 568 | #define V4L2_JPEG_MARKER_COM (1<<6) /* Comment segment */ |
| 569 | 569 | #define V4L2_JPEG_MARKER_APP (1<<7) /* App segment, driver will |
| 570 | − * allways use APP0 */ | |
| 570 | + * always use APP0 */ | |
| 571 | 571 | }; |
| 572 | 572 | |
| 573 | 573 | /* |
| @@ -900,7 +900,7 @@ typedef __u64 v4l2_std_id; · 326 unmodified lines | ||
| 900 | 900 | /* |
| 901 | 901 | * "Common" PAL - This macro is there to be compatible with the old |
| 902 | 902 | * V4L1 concept of "PAL": /BGDKHI. |
| 903 | − * Several PAL standards are mising here: /M, /N and /Nc | |
| 903 | + * Several PAL standards are missing here: /M, /N and /Nc | |
| 904 | 904 | */ |
| 905 | 905 | #define V4L2_STD_PAL (V4L2_STD_PAL_BG |\ |
| 906 | 906 | V4L2_STD_PAL_DK |\ |
| @@ -1787,11 +1787,13 @@ struct v4l2_event_subscription { · 880 unmodified lines | ||
| 1787 | 1787 | /* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */ |
| 1788 | 1788 | |
| 1789 | 1789 | #define V4L2_CHIP_MATCH_BRIDGE 0 /* Match against chip ID on the bridge (0 for the bridge) */ |
| 1790 | +#define V4L2_CHIP_MATCH_SUBDEV 4 /* Match against subdev index */ | |
| 1791 | + | |
| 1792 | +/* The following four defines are no longer in use */ | |
| 1790 | 1793 | #define V4L2_CHIP_MATCH_HOST V4L2_CHIP_MATCH_BRIDGE |
| 1791 | 1794 | #define V4L2_CHIP_MATCH_I2C_DRIVER 1 /* Match against I2C driver name */ |
| 1792 | 1795 | #define V4L2_CHIP_MATCH_I2C_ADDR 2 /* Match against I2C 7-bit address */ |
| 1793 | −#define V4L2_CHIP_MATCH_AC97 3 /* Match against anciliary AC97 chip */ | |
| 1794 | −#define V4L2_CHIP_MATCH_SUBDEV 4 /* Match against subdev index */ | |
| 1796 | +#define V4L2_CHIP_MATCH_AC97 3 /* Match against ancillary AC97 chip */ | |
| 1795 | 1797 | |
| 1796 | 1798 | struct v4l2_dbg_match { |
| 1797 | 1799 | __u32 type; /* Match type */ |
| @@ -1808,13 +1810,6 @@ struct v4l2_dbg_register { · 10 unmodified lines | ||
| 1808 | 1810 | __u64 val; |
| 1809 | 1811 | } __attribute__ ((packed)); |
| 1810 | 1812 | |
| 1811 | −/* VIDIOC_DBG_G_CHIP_IDENT */ | |
| 1812 | −struct v4l2_dbg_chip_ident { | |
| 1813 | − struct v4l2_dbg_match match; | |
| 1814 | − __u32 ident; /* chip identifier as specified in <media/v4l2-chip-ident.h> */ | |
| 1815 | − __u32 revision; /* chip revision, chip specific */ | |
| 1816 | −} __attribute__ ((packed)); | |
| 1817 | − | |
| 1818 | 1813 | #define V4L2_CHIP_FL_READABLE (1 << 0) |
| 1819 | 1814 | #define V4L2_CHIP_FL_WRITABLE (1 << 1) |
| 1820 | 1815 | |
| @@ -1915,12 +1910,6 @@ struct v4l2_create_buffers { · 94 unmodified lines | ||
| 1915 | 1910 | #define VIDIOC_DBG_S_REGISTER _IOW('V', 79, struct v4l2_dbg_register) |
| 1916 | 1911 | #define VIDIOC_DBG_G_REGISTER _IOWR('V', 80, struct v4l2_dbg_register) |
| 1917 | 1912 | |
| 1918 | −/* Experimental, meant for debugging, testing and internal use. | |
| 1919 | − Never use this ioctl in applications! | |
| 1920 | − Note: this ioctl is deprecated in favor of VIDIOC_DBG_G_CHIP_INFO and | |
| 1921 | − will go away in the future. */ | |
| 1922 | −#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident) | |
| 1923 | − | |
| 1924 | 1913 | #define VIDIOC_S_HW_FREQ_SEEK _IOW('V', 82, struct v4l2_hw_freq_seek) |
| 1925 | 1914 | |
| 1926 | 1915 | #define VIDIOC_S_DV_TIMINGS _IOWR('V', 87, struct v4l2_dv_timings) |
| @@ -51,4 +51,7 @@ · 50 unmodified lines | ||
| 51 | 51 | * suppressed them? */ |
| 52 | 52 | #define VIRTIO_F_NOTIFY_ON_EMPTY 24 |
| 53 | 53 | |
| 54 | +/* Can the device handle any descriptor layout? */ | |
| 55 | +#define VIRTIO_F_ANY_LAYOUT 27 | |
| 56 | + | |
| 54 | 57 | #endif /* _UAPI_LINUX_VIRTIO_CONFIG_H */ |
| @@ -38,6 +38,7 @@ · 37 unmodified lines | ||
| 38 | 38 | /* Feature bits */ |
| 39 | 39 | #define VIRTIO_CONSOLE_F_SIZE 0 /* Does host provide console size? */ |
| 40 | 40 | #define VIRTIO_CONSOLE_F_MULTIPORT 1 /* Does host provide multiple ports? */ |
| 41 | +#define VIRTIO_CONSOLE_F_EMERG_WRITE 2 /* Does host support emergency write? */ | |
| 41 | 42 | |
| 42 | 43 | #define VIRTIO_CONSOLE_BAD_ID (~(__u32)0) |
| 43 | 44 | |
| @@ -48,6 +49,8 @@ struct virtio_console_config { · 4 unmodified lines | ||
| 48 | 49 | __u16 rows; |
| 49 | 50 | /* max. number of ports this device can hold */ |
| 50 | 51 | __u32 max_nr_ports; |
| 52 | + /* emergency write register */ | |
| 53 | + __u32 emerg_wr; | |
| 51 | 54 | } __attribute__((packed)); |
| 52 | 55 | |
| 53 | 56 | /* |
| @@ -80,7 +80,9 @@ · 79 unmodified lines | ||
| 80 | 80 | |
| 81 | 81 | /* The remaining space is defined by each driver as the per-driver |
| 82 | 82 | * configuration space */ |
| 83 | −#define VIRTIO_PCI_CONFIG(dev) ((dev)->msix_enabled ? 24 : 20) | |
| 83 | +#define VIRTIO_PCI_CONFIG_OFF(msix_enabled) ((msix_enabled) ? 24 : 20) | |
| 84 | +/* Deprecated: please use VIRTIO_PCI_CONFIG_OFF instead */ | |
| 85 | +#define VIRTIO_PCI_CONFIG(dev) VIRTIO_PCI_CONFIG_OFF((dev)->msix_enabled) | |
| 84 | 86 | |
| 85 | 87 | /* Virtio ABI version, this must match exactly */ |
| 86 | 88 | #define VIRTIO_PCI_ABI_VERSION 0 |
| @@ -173,7 +173,10 @@ · 172 unmodified lines | ||
| 173 | 173 | |
| 174 | 174 | #define UBI_VOL_IOC_MAGIC 'O' |
| 175 | 175 | |
| 176 | −/* Start UBI volume update */ | |
| 176 | +/* Start UBI volume update | |
| 177 | + * Note: This actually takes a pointer (__s64*), but we can't change | |
| 178 | + * that without breaking the ABI on 32bit systems | |
| 179 | + */ | |
| 177 | 180 | #define UBI_IOCVOLUP _IOW(UBI_VOL_IOC_MAGIC, 0, __s64) |
| 178 | 181 | /* LEB erasure command, used for debugging, disabled by default */ |
| 179 | 182 | #define UBI_IOCEBER _IOW(UBI_VOL_IOC_MAGIC, 1, __s32) |
| @@ -45,8 +45,8 @@ · 44 unmodified lines | ||
| 45 | 45 | enum { |
| 46 | 46 | RDMA_USER_CM_CMD_CREATE_ID, |
| 47 | 47 | RDMA_USER_CM_CMD_DESTROY_ID, |
| 48 | − RDMA_USER_CM_CMD_BIND_ADDR, | |
| 49 | − RDMA_USER_CM_CMD_RESOLVE_ADDR, | |
| 48 | + RDMA_USER_CM_CMD_BIND_IP, | |
| 49 | + RDMA_USER_CM_CMD_RESOLVE_IP, | |
| 50 | 50 | RDMA_USER_CM_CMD_RESOLVE_ROUTE, |
| 51 | 51 | RDMA_USER_CM_CMD_QUERY_ROUTE, |
| 52 | 52 | RDMA_USER_CM_CMD_CONNECT, |
| @@ -59,9 +59,13 @@ enum { · 6 unmodified lines | ||
| 59 | 59 | RDMA_USER_CM_CMD_GET_OPTION, |
| 60 | 60 | RDMA_USER_CM_CMD_SET_OPTION, |
| 61 | 61 | RDMA_USER_CM_CMD_NOTIFY, |
| 62 | − RDMA_USER_CM_CMD_JOIN_MCAST, | |
| 62 | + RDMA_USER_CM_CMD_JOIN_IP_MCAST, | |
| 63 | 63 | RDMA_USER_CM_CMD_LEAVE_MCAST, |
| 64 | − RDMA_USER_CM_CMD_MIGRATE_ID | |
| 64 | + RDMA_USER_CM_CMD_MIGRATE_ID, | |
| 65 | + RDMA_USER_CM_CMD_QUERY, | |
| 66 | + RDMA_USER_CM_CMD_BIND, | |
| 67 | + RDMA_USER_CM_CMD_RESOLVE_ADDR, | |
| 68 | + RDMA_USER_CM_CMD_JOIN_MCAST | |
| 65 | 69 | }; |
| 66 | 70 | |
| 67 | 71 | /* |
| @@ -95,28 +99,51 @@ struct rdma_ucm_destroy_id_resp { · 27 unmodified lines | ||
| 95 | 99 | __u32 events_reported; |
| 96 | 100 | }; |
| 97 | 101 | |
| 98 | −struct rdma_ucm_bind_addr { | |
| 102 | +struct rdma_ucm_bind_ip { | |
| 99 | 103 | __u64 response; |
| 100 | 104 | struct sockaddr_in6 addr; |
| 101 | 105 | __u32 id; |
| 102 | 106 | }; |
| 103 | 107 | |
| 104 | −struct rdma_ucm_resolve_addr { | |
| 108 | +struct rdma_ucm_bind { | |
| 109 | + __u32 id; | |
| 110 | + __u16 addr_size; | |
| 111 | + __u16 reserved; | |
| 112 | + struct sockaddr_storage addr; | |
| 113 | +}; | |
| 114 | + | |
| 115 | +struct rdma_ucm_resolve_ip { | |
| 105 | 116 | struct sockaddr_in6 src_addr; |
| 106 | 117 | struct sockaddr_in6 dst_addr; |
| 107 | 118 | __u32 id; |
| 108 | 119 | __u32 timeout_ms; |
| 109 | 120 | }; |
| 110 | 121 | |
| 122 | +struct rdma_ucm_resolve_addr { | |
| 123 | + __u32 id; | |
| 124 | + __u32 timeout_ms; | |
| 125 | + __u16 src_size; | |
| 126 | + __u16 dst_size; | |
| 127 | + __u32 reserved; | |
| 128 | + struct sockaddr_storage src_addr; | |
| 129 | + struct sockaddr_storage dst_addr; | |
| 130 | +}; | |
| 131 | + | |
| 111 | 132 | struct rdma_ucm_resolve_route { |
| 112 | 133 | __u32 id; |
| 113 | 134 | __u32 timeout_ms; |
| 114 | 135 | }; |
| 115 | 136 | |
| 116 | −struct rdma_ucm_query_route { | |
| 137 | +enum { | |
| 138 | + RDMA_USER_CM_QUERY_ADDR, | |
| 139 | + RDMA_USER_CM_QUERY_PATH, | |
| 140 | + RDMA_USER_CM_QUERY_GID | |
| 141 | +}; | |
| 142 | + | |
| 143 | +struct rdma_ucm_query { | |
| 117 | 144 | __u64 response; |
| 118 | 145 | __u32 id; |
| 119 | − __u32 reserved; | |
| 146 | + __u32 option; | |
| 120 | 147 | }; |
| 121 | 148 | |
| 122 | 149 | struct rdma_ucm_query_route_resp { |
| @@ -129,9 +156,26 @@ struct rdma_ucm_query_route_resp { · 6 unmodified lines | ||
| 129 | 156 | __u8 reserved[3]; |
| 130 | 157 | }; |
| 131 | 158 | |
| 159 | +struct rdma_ucm_query_addr_resp { | |
| 160 | + __u64 node_guid; | |
| 161 | + __u8 port_num; | |
| 162 | + __u8 reserved; | |
| 163 | + __u16 pkey; | |
| 164 | + __u16 src_size; | |
| 165 | + __u16 dst_size; | |
| 166 | + struct sockaddr_storage src_addr; | |
| 167 | + struct sockaddr_storage dst_addr; | |
| 168 | +}; | |
| 169 | + | |
| 170 | +struct rdma_ucm_query_path_resp { | |
| 171 | + __u32 num_paths; | |
| 172 | + __u32 reserved; | |
| 173 | + struct ib_path_rec_data path_data[0]; | |
| 174 | +}; | |
| 175 | + | |
| 132 | 176 | struct rdma_ucm_conn_param { |
| 133 | 177 | __u32 qp_num; |
| 134 | − __u32 reserved; | |
| 178 | + __u32 qkey; | |
| 135 | 179 | __u8 private_data[RDMA_MAX_PRIVATE_DATA]; |
| 136 | 180 | __u8 private_data_len; |
| 137 | 181 | __u8 srq; |
| @@ -192,13 +236,22 @@ struct rdma_ucm_notify { · 54 unmodified lines | ||
| 192 | 236 | __u32 event; |
| 193 | 237 | }; |
| 194 | 238 | |
| 195 | −struct rdma_ucm_join_mcast { | |
| 239 | +struct rdma_ucm_join_ip_mcast { | |
| 196 | 240 | __u64 response; /* rdma_ucm_create_id_resp */ |
| 197 | 241 | __u64 uid; |
| 198 | 242 | struct sockaddr_in6 addr; |
| 199 | 243 | __u32 id; |
| 200 | 244 | }; |
| 201 | 245 | |
| 246 | +struct rdma_ucm_join_mcast { | |
| 247 | + __u64 response; /* rdma_ucma_create_id_resp */ | |
| 248 | + __u64 uid; | |
| 249 | + __u32 id; | |
| 250 | + __u16 addr_size; | |
| 251 | + __u16 reserved; | |
| 252 | + struct sockaddr_storage addr; | |
| 253 | +}; | |
| 254 | + | |
| 202 | 255 | struct rdma_ucm_get_event { |
| 203 | 256 | __u64 response; |
| 204 | 257 | }; |
| @@ -817,6 +817,8 @@ typedef int __bitwise snd_ctl_elem_iface_t; · 816 unmodified lines | ||
| 817 | 817 | #define SNDRV_CTL_POWER_D3hot (SNDRV_CTL_POWER_D3|0x0000) /* Off, with power */ |
| 818 | 818 | #define SNDRV_CTL_POWER_D3cold (SNDRV_CTL_POWER_D3|0x0001) /* Off, without power */ |
| 819 | 819 | |
| 820 | +#define SNDRV_CTL_ELEM_ID_NAME_MAXLEN 44 | |
| 821 | + | |
| 820 | 822 | struct snd_ctl_elem_id { |
| 821 | 823 | unsigned int numid; /* numeric identifier, zero = invalid */ |
| 822 | 824 | snd_ctl_elem_iface_t iface; /* interface identifier */ |