History

Merge commit 'Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux'

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.

Daniel Vetter committed 13 years ago

Commit cb54b532 parents d861e33 549f3a19108 files · +660638 −274921Browse files

Showing the changes to include/uapi (41 of 9108 files). Show all

Unified · Split

41 files
  1. include/uapi/asm-generic/fcntl.h +8 −0
  2. include/uapi/asm-generic/poll.h +2 −0
  3. include/uapi/asm-generic/socket.h +2 −0
  4. include/uapi/asm-generic/unistd.h +1 −1
  5. include/uapi/linux/Kbuild +2 −0
  6. include/uapi/linux/bcm933xx_hcs.h +24 −0
  7. include/uapi/linux/btrfs.h +41 −1
  8. include/uapi/linux/const.h +3 −0
  9. include/uapi/linux/dm-ioctl.h +2 −2
  10. include/uapi/linux/ethtool.h +2 −2
  11. include/uapi/linux/gen_stats.h +11 −0
  12. include/uapi/linux/if_arp.h +1 −0
  13. include/uapi/linux/if_link.h +15 −0
  14. include/uapi/linux/if_pppox.h +2 −2
  15. include/uapi/linux/if_tun.h +2 −0
  16. include/uapi/linux/input.h +13 −4
  17. include/uapi/linux/ip_vs.h +6 −0
  18. include/uapi/linux/kvm.h +2 −0
  19. include/uapi/linux/msdos_fs.h +10 −0
  20. include/uapi/linux/netfilter/nfnetlink_queue.h +2 −0
  21. include/uapi/linux/netfilter/xt_socket.h +7 −0
  22. include/uapi/linux/nfc.h +17 −1
  23. include/uapi/linux/nl80211.h +37 −0
  24. include/uapi/linux/openvswitch.h +19 −1
  25. include/uapi/linux/pci_regs.h +1 −1
  26. include/uapi/linux/perf_event.h +4 −1
  27. include/uapi/linux/ptrace.h +3 −0
  28. include/uapi/linux/rtnetlink.h +2 −0
  29. include/uapi/linux/serial_core.h +6 −0
  30. include/uapi/linux/snmp.h +2 −0
  31. include/uapi/linux/tipc.h +1 −1
  32. include/uapi/linux/tipc_config.h +1 −1
  33. include/uapi/linux/v4l2-controls.h +2 −2
  34. include/uapi/linux/vfio.h +40 −2
  35. include/uapi/linux/videodev2.h +8 −19
  36. include/uapi/linux/virtio_config.h +3 −0
  37. include/uapi/linux/virtio_console.h +3 −0
  38. include/uapi/linux/virtio_pci.h +3 −1
  39. include/uapi/mtd/ubi-user.h +4 −1
  40. include/uapi/rdma/rdma_user_cm.h +63 −10
  41. include/uapi/sound/asound.h +2 −0
include/uapi/asm-generic/fcntl.h+8−0
@@ -84,6 +84,14 @@ · 83 unmodified lines
84#define O_PATH 01000000084#define O_PATH 010000000
85#endif85#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#ifndef O_NDELAY95#ifndef O_NDELAY
88#define O_NDELAY O_NONBLOCK96#define O_NDELAY O_NONBLOCK
89#endif97#endif
include/uapi/asm-generic/poll.h+2−0
@@ -30,6 +30,8 @@ · 29 unmodified lines
30 30
31#define POLLFREE 0x4000 /* currently only for epoll */31#define POLLFREE 0x4000 /* currently only for epoll */
32 32
33#define POLL_BUSY_LOOP 0x8000
34
33struct pollfd {35struct pollfd {
34 int fd;36 int fd;
35 short events;37 short events;
include/uapi/asm-generic/socket.h+2−0
@@ -76,4 +76,6 @@ · 75 unmodified lines
76 76
77#define SO_SELECT_ERR_QUEUE 4577#define SO_SELECT_ERR_QUEUE 45
78 78
79#define SO_BUSY_POLL 46
80
79#endif /* __ASM_GENERIC_SOCKET_H */81#endif /* __ASM_GENERIC_SOCKET_H */
include/uapi/asm-generic/unistd.h+1−1
@@ -361,7 +361,7 @@ __SYSCALL(__NR_syslog, sys_syslog) · 360 unmodified lines
361#define __NR_ptrace 117361#define __NR_ptrace 117
362__SYSCALL(__NR_ptrace, sys_ptrace)362__SYSCALL(__NR_ptrace, sys_ptrace)
363 363
364/* kernel/sched.c */364/* kernel/sched/core.c */
365#define __NR_sched_setparam 118365#define __NR_sched_setparam 118
366__SYSCALL(__NR_sched_setparam, sys_sched_setparam)366__SYSCALL(__NR_sched_setparam, sys_sched_setparam)
367#define __NR_sched_setscheduler 119367#define __NR_sched_setscheduler 119
include/uapi/linux/Kbuild+2−0
@@ -62,6 +62,7 @@ header-y += auxvec.h · 61 unmodified lines
62header-y += ax25.h62header-y += ax25.h
63header-y += b1lli.h63header-y += b1lli.h
64header-y += baycom.h64header-y += baycom.h
65header-y += bcm933xx_hcs.h
65header-y += bfs_fs.h66header-y += bfs_fs.h
66header-y += binfmts.h67header-y += binfmts.h
67header-y += blkpg.h68header-y += blkpg.h
@@ -261,6 +262,7 @@ header-y += net_dropmon.h · 193 unmodified lines
261header-y += net_tstamp.h262header-y += net_tstamp.h
262header-y += netconf.h263header-y += netconf.h
263header-y += netdevice.h264header-y += netdevice.h
265header-y += netlink_diag.h
264header-y += netfilter.h266header-y += netfilter.h
265header-y += netfilter_arp.h267header-y += netfilter_arp.h
266header-y += netfilter_bridge.h268header-y += netfilter_bridge.h
include/uapi/linux/bcm933xx_hcs.h+24−0
@@ -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
10struct 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 */
include/uapi/linux/btrfs.h+41−1
@@ -447,6 +447,46 @@ struct btrfs_ioctl_send_args { · 446 unmodified lines
447 __u64 reserved[4]; /* in */447 __u64 reserved[4]; /* in */
448};448};
449 449
450/* Error codes as returned by the kernel */
451enum 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*/
465static 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#define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \490#define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \
451 struct btrfs_ioctl_vol_args)491 struct btrfs_ioctl_vol_args)
452#define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \492#define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \
@@ -530,6 +570,7 @@ struct btrfs_ioctl_send_args { · 77 unmodified lines
530 struct btrfs_ioctl_quota_rescan_args)570 struct btrfs_ioctl_quota_rescan_args)
531#define BTRFS_IOC_QUOTA_RESCAN_STATUS _IOR(BTRFS_IOCTL_MAGIC, 45, \571#define BTRFS_IOC_QUOTA_RESCAN_STATUS _IOR(BTRFS_IOCTL_MAGIC, 45, \
532 struct btrfs_ioctl_quota_rescan_args)572 struct btrfs_ioctl_quota_rescan_args)
573#define BTRFS_IOC_QUOTA_RESCAN_WAIT _IO(BTRFS_IOCTL_MAGIC, 46)
533#define BTRFS_IOC_GET_FSLABEL _IOR(BTRFS_IOCTL_MAGIC, 49, \574#define BTRFS_IOC_GET_FSLABEL _IOR(BTRFS_IOCTL_MAGIC, 49, \
534 char[BTRFS_LABEL_SIZE])575 char[BTRFS_LABEL_SIZE])
535#define BTRFS_IOC_SET_FSLABEL _IOW(BTRFS_IOCTL_MAGIC, 50, \576#define BTRFS_IOC_SET_FSLABEL _IOW(BTRFS_IOCTL_MAGIC, 50, \
@@ -538,5 +579,4 @@ struct btrfs_ioctl_send_args { · 2 unmodified lines
538 struct btrfs_ioctl_get_dev_stats)579 struct btrfs_ioctl_get_dev_stats)
539#define BTRFS_IOC_DEV_REPLACE _IOWR(BTRFS_IOCTL_MAGIC, 53, \580#define BTRFS_IOC_DEV_REPLACE _IOWR(BTRFS_IOCTL_MAGIC, 53, \
540 struct btrfs_ioctl_dev_replace_args)581 struct btrfs_ioctl_dev_replace_args)
541
542#endif /* _UAPI_LINUX_BTRFS_H */582#endif /* _UAPI_LINUX_BTRFS_H */
include/uapi/linux/const.h+3−0
@@ -21,4 +21,7 @@ · 20 unmodified lines
21#define _AT(T,X) ((T)(X))21#define _AT(T,X) ((T)(X))
22#endif22#endif
23 23
24#define _BITUL(x) (_AC(1,UL) << (x))
25#define _BITULL(x) (_AC(1,ULL) << (x))
26
24#endif /* !(_LINUX_CONST_H) */27#endif /* !(_LINUX_CONST_H) */
include/uapi/linux/dm-ioctl.h+2−2
@@ -267,9 +267,9 @@ enum { · 266 unmodified lines
267#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)267#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
268 268
269#define DM_VERSION_MAJOR 4269#define DM_VERSION_MAJOR 4
270#define DM_VERSION_MINOR 24270#define DM_VERSION_MINOR 25
271#define DM_VERSION_PATCHLEVEL 0271#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/* Status bits */274/* Status bits */
275#define DM_READONLY_FLAG (1 << 0) /* In/Out */275#define DM_READONLY_FLAG (1 << 0) /* In/Out */
include/uapi/linux/ethtool.h+2−2
@@ -993,8 +993,8 @@ enum ethtool_sfeatures_retval_bits { · 992 unmodified lines
993#define PORT_OTHER 0xff993#define PORT_OTHER 0xff
994 994
995/* Which transceiver to use. */995/* Which transceiver to use. */
996#define XCVR_INTERNAL 0x00996#define XCVR_INTERNAL 0x00 /* PHY and MAC are in the same package */
997#define XCVR_EXTERNAL 0x01997#define XCVR_EXTERNAL 0x01 /* PHY and MAC are in different packages */
998#define XCVR_DUMMY1 0x02998#define XCVR_DUMMY1 0x02
999#define XCVR_DUMMY2 0x03999#define XCVR_DUMMY2 0x03
1000#define XCVR_DUMMY3 0x041000#define XCVR_DUMMY3 0x04
include/uapi/linux/gen_stats.h+11−0
@@ -9,6 +9,7 @@ enum { · 8 unmodified lines
9 TCA_STATS_RATE_EST,9 TCA_STATS_RATE_EST,
10 TCA_STATS_QUEUE,10 TCA_STATS_QUEUE,
11 TCA_STATS_APP,11 TCA_STATS_APP,
12 TCA_STATS_RATE_EST64,
12 __TCA_STATS_MAX,13 __TCA_STATS_MAX,
13};14};
14#define TCA_STATS_MAX (__TCA_STATS_MAX - 1)15#define TCA_STATS_MAX (__TCA_STATS_MAX - 1)
@@ -37,6 +38,16 @@ struct gnet_stats_rate_est { · 22 unmodified lines
37 __u32 pps;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 */
46struct gnet_stats_rate_est64 {
47 __u64 bps;
48 __u64 pps;
49};
50
40/**51/**
41 * struct gnet_stats_queue - queuing statistics52 * struct gnet_stats_queue - queuing statistics
42 * @qlen: queue length53 * @qlen: queue length
include/uapi/linux/if_arp.h+1−0
@@ -93,6 +93,7 @@ · 92 unmodified lines
93#define ARPHRD_PHONET_PIPE 821 /* PhoNet pipe header */93#define ARPHRD_PHONET_PIPE 821 /* PhoNet pipe header */
94#define ARPHRD_CAIF 822 /* CAIF media type */94#define ARPHRD_CAIF 822 /* CAIF media type */
95#define ARPHRD_IP6GRE 823 /* GRE over IPv6 */95#define ARPHRD_IP6GRE 823 /* GRE over IPv6 */
96#define ARPHRD_NETLINK 824 /* Netlink header */
96 97
97#define ARPHRD_VOID 0xFFFF /* Void type, nothing is known */98#define ARPHRD_VOID 0xFFFF /* Void type, nothing is known */
98#define ARPHRD_NONE 0xFFFE /* zero header length */99#define ARPHRD_NONE 0xFFFE /* zero header length */
include/uapi/linux/if_link.h+15−0
@@ -221,6 +221,8 @@ enum { · 220 unmodified lines
221 IFLA_BRPORT_GUARD, /* bpdu guard */221 IFLA_BRPORT_GUARD, /* bpdu guard */
222 IFLA_BRPORT_PROTECT, /* root port protection */222 IFLA_BRPORT_PROTECT, /* root port protection */
223 IFLA_BRPORT_FAST_LEAVE, /* multicast fast leave */223 IFLA_BRPORT_FAST_LEAVE, /* multicast fast leave */
224 IFLA_BRPORT_LEARNING, /* mac learning */
225 IFLA_BRPORT_UNICAST_FLOOD, /* flood unicast traffic */
224 __IFLA_BRPORT_MAX226 __IFLA_BRPORT_MAX
225};227};
226#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)228#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -336,6 +338,7 @@ enum { · 109 unmodified lines
336 IFLA_VF_VLAN,338 IFLA_VF_VLAN,
337 IFLA_VF_TX_RATE, /* TX Bandwidth Allocation */339 IFLA_VF_TX_RATE, /* TX Bandwidth Allocation */
338 IFLA_VF_SPOOFCHK, /* Spoof Checking on/off switch */340 IFLA_VF_SPOOFCHK, /* Spoof Checking on/off switch */
341 IFLA_VF_LINK_STATE, /* link state enable/disable/auto switch */
339 __IFLA_VF_MAX,342 __IFLA_VF_MAX,
340};343};
341 344
@@ -362,6 +365,18 @@ struct ifla_vf_spoofchk { · 20 unmodified lines
362 __u32 setting;365 __u32 setting;
363};366};
364 367
368enum {
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
375struct ifla_vf_link_state {
376 __u32 vf;
377 __u32 link_state;
378};
379
365/* VF ports management section380/* VF ports management section
366 *381 *
367 * Nested layout of set/get msg is:382 * Nested layout of set/get msg is:
include/uapi/linux/if_pppox.h+2−2
@@ -135,11 +135,11 @@ struct pppoe_tag { · 134 unmodified lines
135 135
136struct pppoe_hdr {136struct pppoe_hdr {
137#if defined(__LITTLE_ENDIAN_BITFIELD)137#if defined(__LITTLE_ENDIAN_BITFIELD)
138 __u8 ver : 4;
139 __u8 type : 4;138 __u8 type : 4;
139 __u8 ver : 4;
140#elif defined(__BIG_ENDIAN_BITFIELD)140#elif defined(__BIG_ENDIAN_BITFIELD)
141 __u8 type : 4;
142 __u8 ver : 4;141 __u8 ver : 4;
142 __u8 type : 4;
143#else143#else
144#error "Please fix <asm/byteorder.h>"144#error "Please fix <asm/byteorder.h>"
145#endif145#endif
include/uapi/linux/if_tun.h+2−0
@@ -68,6 +68,8 @@ · 67 unmodified lines
68#define IFF_MULTI_QUEUE 0x010068#define IFF_MULTI_QUEUE 0x0100
69#define IFF_ATTACH_QUEUE 0x020069#define IFF_ATTACH_QUEUE 0x0200
70#define IFF_DETACH_QUEUE 0x040070#define IFF_DETACH_QUEUE 0x0400
71/* read-only flag */
72#define IFF_PERSIST 0x0800
71 73
72/* Features for GSO (TUNSETOFFLOAD). */74/* Features for GSO (TUNSETOFFLOAD). */
73#define TUN_F_CSUM 0x01 /* You can hand me unchecksummed packets. */75#define TUN_F_CSUM 0x01 /* You can hand me unchecksummed packets. */
include/uapi/linux/input.h+13−4
@@ -506,11 +506,15 @@ struct input_keymap_entry { · 505 unmodified lines
506#define BTN_DEAD 0x12f506#define BTN_DEAD 0x12f
507 507
508#define BTN_GAMEPAD 0x130508#define BTN_GAMEPAD 0x130
509#define BTN_A 0x130509#define BTN_SOUTH 0x130
510#define BTN_B 0x131510#define BTN_A BTN_SOUTH
511#define BTN_EAST 0x131
512#define BTN_B BTN_EAST
511#define BTN_C 0x132513#define BTN_C 0x132
512#define BTN_X 0x133514#define BTN_NORTH 0x133
513#define BTN_Y 0x134515#define BTN_X BTN_NORTH
516#define BTN_WEST 0x134
517#define BTN_Y BTN_WEST
514#define BTN_Z 0x135518#define BTN_Z 0x135
515#define BTN_TL 0x136519#define BTN_TL 0x136
516#define BTN_TR 0x137520#define BTN_TR 0x137
@@ -707,6 +711,11 @@ struct input_keymap_entry { · 190 unmodified lines
707#define KEY_ATTENDANT_TOGGLE 0x21d /* Attendant call on or off */711#define KEY_ATTENDANT_TOGGLE 0x21d /* Attendant call on or off */
708#define KEY_LIGHTS_TOGGLE 0x21e /* Reading light on or off */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#define BTN_TRIGGER_HAPPY 0x2c0719#define BTN_TRIGGER_HAPPY 0x2c0
711#define BTN_TRIGGER_HAPPY1 0x2c0720#define BTN_TRIGGER_HAPPY1 0x2c0
712#define BTN_TRIGGER_HAPPY2 0x2c1721#define BTN_TRIGGER_HAPPY2 0x2c1
include/uapi/linux/ip_vs.h+6−0
@@ -20,6 +20,12 @@ · 19 unmodified lines
20#define IP_VS_SVC_F_PERSISTENT 0x0001 /* persistent port */20#define IP_VS_SVC_F_PERSISTENT 0x0001 /* persistent port */
21#define IP_VS_SVC_F_HASHED 0x0002 /* hashed entry */21#define IP_VS_SVC_F_HASHED 0x0002 /* hashed entry */
22#define IP_VS_SVC_F_ONEPACKET 0x0004 /* one-packet scheduling */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 * Destination Server Flags31 * Destination Server Flags
include/uapi/linux/kvm.h+2−0
@@ -666,6 +666,7 @@ struct kvm_ppc_smmu_info { · 665 unmodified lines
666#define KVM_CAP_IRQ_MPIC 90666#define KVM_CAP_IRQ_MPIC 90
667#define KVM_CAP_PPC_RTAS 91667#define KVM_CAP_PPC_RTAS 91
668#define KVM_CAP_IRQ_XICS 92668#define KVM_CAP_IRQ_XICS 92
669#define KVM_CAP_ARM_EL1_32BIT 93
669 670
670#ifdef KVM_CAP_IRQ_ROUTING671#ifdef KVM_CAP_IRQ_ROUTING
671 672
@@ -783,6 +784,7 @@ struct kvm_dirty_tlb { · 111 unmodified lines
783#define KVM_REG_IA64 0x3000000000000000ULL784#define KVM_REG_IA64 0x3000000000000000ULL
784#define KVM_REG_ARM 0x4000000000000000ULL785#define KVM_REG_ARM 0x4000000000000000ULL
785#define KVM_REG_S390 0x5000000000000000ULL786#define KVM_REG_S390 0x5000000000000000ULL
787#define KVM_REG_ARM64 0x6000000000000000ULL
786#define KVM_REG_MIPS 0x7000000000000000ULL788#define KVM_REG_MIPS 0x7000000000000000ULL
787 789
788#define KVM_REG_SIZE_SHIFT 52790#define KVM_REG_SIZE_SHIFT 52
include/uapi/linux/msdos_fs.h+10−0
@@ -104,6 +104,8 @@ struct __fat_dirent { · 103 unmodified lines
104/* <linux/videotext.h> has used 0x72 ('r') in collision, so skip a few */104/* <linux/videotext.h> has used 0x72 ('r') in collision, so skip a few */
105#define FAT_IOCTL_GET_ATTRIBUTES _IOR('r', 0x10, __u32)105#define FAT_IOCTL_GET_ATTRIBUTES _IOR('r', 0x10, __u32)
106#define FAT_IOCTL_SET_ATTRIBUTES _IOW('r', 0x11, __u32)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
108struct fat_boot_sector {110struct fat_boot_sector {
109 __u8 ignored[3]; /* Boot strap short or near jump */111 __u8 ignored[3]; /* Boot strap short or near jump */
@@ -128,6 +130,10 @@ struct fat_boot_sector { · 18 unmodified lines
128 __u8 drive_number; /* Physical drive number */130 __u8 drive_number; /* Physical drive number */
129 __u8 state; /* undocumented, but used131 __u8 state; /* undocumented, but used
130 for mount state. */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 /* other fiealds are not added here */137 /* other fiealds are not added here */
132 } fat16;138 } fat16;
133 139
@@ -147,6 +153,10 @@ struct fat_boot_sector { · 13 unmodified lines
147 __u8 drive_number; /* Physical drive number */153 __u8 drive_number; /* Physical drive number */
148 __u8 state; /* undocumented, but used154 __u8 state; /* undocumented, but used
149 for mount state. */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 /* other fiealds are not added here */160 /* other fiealds are not added here */
151 } fat32;161 } fat32;
152 };162 };
include/uapi/linux/netfilter/nfnetlink_queue.h+2−0
@@ -105,5 +105,7 @@ enum nfqnl_attr_config { · 104 unmodified lines
105#define NFQA_SKB_CSUMNOTREADY (1 << 0)105#define NFQA_SKB_CSUMNOTREADY (1 << 0)
106/* packet is GSO (i.e., exceeds device mtu) */106/* packet is GSO (i.e., exceeds device mtu) */
107#define NFQA_SKB_GSO (1 << 1)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#endif /* _NFNETLINK_QUEUE_H */111#endif /* _NFNETLINK_QUEUE_H */
include/uapi/linux/netfilter/xt_socket.h+7−0
@@ -5,10 +5,17 @@ · 4 unmodified lines
5 5
6enum {6enum {
7 XT_SOCKET_TRANSPARENT = 1 << 0,7 XT_SOCKET_TRANSPARENT = 1 << 0,
8 XT_SOCKET_NOWILDCARD = 1 << 1,
8};9};
9 10
10struct xt_socket_mtinfo1 {11struct xt_socket_mtinfo1 {
11 __u8 flags;12 __u8 flags;
12};13};
14#define XT_SOCKET_FLAGS_V1 XT_SOCKET_TRANSPARENT
15
16struct xt_socket_mtinfo2 {
17 __u8 flags;
18};
19#define XT_SOCKET_FLAGS_V2 (XT_SOCKET_TRANSPARENT | XT_SOCKET_NOWILDCARD)
13 20
14#endif /* _XT_SOCKET_H */21#endif /* _XT_SOCKET_H */
include/uapi/linux/nfc.h+17−1
@@ -69,6 +69,8 @@ · 68 unmodified lines
69 * starting a poll from a device which has a secure element enabled means69 * starting a poll from a device which has a secure element enabled means
70 * we want to do SE based card emulation.70 * we want to do SE based card emulation.
71 * @NFC_CMD_DISABLE_SE: Disable the physical link to a specific secure element.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 */
73enum nfc_commands {75enum nfc_commands {
74 NFC_CMD_UNSPEC,76 NFC_CMD_UNSPEC,
@@ -92,6 +94,9 @@ enum nfc_commands { · 17 unmodified lines
92 NFC_CMD_DISABLE_SE,94 NFC_CMD_DISABLE_SE,
93 NFC_CMD_LLC_SDREQ,95 NFC_CMD_LLC_SDREQ,
94 NFC_EVENT_LLC_SDRES,96 NFC_EVENT_LLC_SDRES,
97 NFC_CMD_FW_UPLOAD,
98 NFC_EVENT_SE_ADDED,
99 NFC_EVENT_SE_REMOVED,
95/* private: internal use only */100/* private: internal use only */
96 __NFC_CMD_AFTER_LAST101 __NFC_CMD_AFTER_LAST
97};102};
@@ -121,6 +126,9 @@ enum nfc_commands { · 23 unmodified lines
121 * @NFC_ATTR_LLC_PARAM_RW: Receive Window size parameter126 * @NFC_ATTR_LLC_PARAM_RW: Receive Window size parameter
122 * @NFC_ATTR_LLC_PARAM_MIUX: MIU eXtension parameter127 * @NFC_ATTR_LLC_PARAM_MIUX: MIU eXtension parameter
123 * @NFC_ATTR_SE: Available Secure Elements128 * @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 */
125enum nfc_attrs {133enum nfc_attrs {
126 NFC_ATTR_UNSPEC,134 NFC_ATTR_UNSPEC,
@@ -143,6 +151,9 @@ enum nfc_attrs { · 16 unmodified lines
143 NFC_ATTR_LLC_PARAM_MIUX,151 NFC_ATTR_LLC_PARAM_MIUX,
144 NFC_ATTR_SE,152 NFC_ATTR_SE,
145 NFC_ATTR_LLC_SDP,153 NFC_ATTR_LLC_SDP,
154 NFC_ATTR_FIRMWARE_NAME,
155 NFC_ATTR_SE_INDEX,
156 NFC_ATTR_SE_TYPE,
146/* private: internal use only */157/* private: internal use only */
147 __NFC_ATTR_AFTER_LAST158 __NFC_ATTR_AFTER_LAST
148};159};
@@ -159,9 +170,12 @@ enum nfc_sdp_attr { · 10 unmodified lines
159 170
160#define NFC_DEVICE_NAME_MAXSIZE 8171#define NFC_DEVICE_NAME_MAXSIZE 8
161#define NFC_NFCID1_MAXSIZE 10172#define NFC_NFCID1_MAXSIZE 10
173#define NFC_NFCID2_MAXSIZE 8
174#define NFC_NFCID3_MAXSIZE 10
162#define NFC_SENSB_RES_MAXSIZE 12175#define NFC_SENSB_RES_MAXSIZE 12
163#define NFC_SENSF_RES_MAXSIZE 18176#define NFC_SENSF_RES_MAXSIZE 18
164#define NFC_GB_MAXSIZE 48177#define NFC_GB_MAXSIZE 48
178#define NFC_FIRMWARE_NAME_MAXSIZE 32
165 179
166/* NFC protocols */180/* NFC protocols */
167#define NFC_PROTO_JEWEL 1181#define NFC_PROTO_JEWEL 1
@@ -191,10 +205,12 @@ enum nfc_sdp_attr { · 23 unmodified lines
191#define NFC_PROTO_ISO14443_B_MASK (1 << NFC_PROTO_ISO14443_B)205#define NFC_PROTO_ISO14443_B_MASK (1 << NFC_PROTO_ISO14443_B)
192 206
193/* NFC Secure Elements */207/* NFC Secure Elements */
194#define NFC_SE_NONE 0x0
195#define NFC_SE_UICC 0x1208#define NFC_SE_UICC 0x1
196#define NFC_SE_EMBEDDED 0x2209#define NFC_SE_EMBEDDED 0x2
197 210
211#define NFC_SE_DISABLED 0x0
212#define NFC_SE_ENABLED 0x1
213
198struct sockaddr_nfc {214struct sockaddr_nfc {
199 sa_family_t sa_family;215 sa_family_t sa_family;
200 __u32 dev_idx;216 __u32 dev_idx;
include/uapi/linux/nl80211.h+37−0
@@ -27,6 +27,8 @@ · 26 unmodified lines
27 27
28#include <linux/types.h>28#include <linux/types.h>
29 29
30#define NL80211_GENL_NAME "nl80211"
31
30/**32/**
31 * DOC: Station handling33 * DOC: Station handling
32 *34 *
@@ -1429,6 +1431,11 @@ enum nl80211_commands { · 1396 unmodified lines
1429 * @NL80211_ATTR_MAX_CRIT_PROT_DURATION: duration in milliseconds in which1431 * @NL80211_ATTR_MAX_CRIT_PROT_DURATION: duration in milliseconds in which
1430 * the connection should have increased reliability (u16).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 * @NL80211_ATTR_MAX: highest attribute number currently defined1439 * @NL80211_ATTR_MAX: highest attribute number currently defined
1433 * @__NL80211_ATTR_AFTER_LAST: internal use1440 * @__NL80211_ATTR_AFTER_LAST: internal use
1434 */1441 */
@@ -1727,6 +1734,8 @@ enum nl80211_attrs { · 292 unmodified lines
1727 NL80211_ATTR_CRIT_PROT_ID,1734 NL80211_ATTR_CRIT_PROT_ID,
1728 NL80211_ATTR_MAX_CRIT_PROT_DURATION,1735 NL80211_ATTR_MAX_CRIT_PROT_DURATION,
1729 1736
1737 NL80211_ATTR_PEER_AID,
1738
1730 /* add attributes here, update the policy in nl80211.c */1739 /* add attributes here, update the policy in nl80211.c */
1731 1740
1732 __NL80211_ATTR_AFTER_LAST,1741 __NL80211_ATTR_AFTER_LAST,
@@ -1991,6 +2000,10 @@ enum nl80211_sta_bss_param { · 258 unmodified lines
1991 * @NL80211_STA_INFO_PEER_PM: peer mesh STA link-specific power mode2000 * @NL80211_STA_INFO_PEER_PM: peer mesh STA link-specific power mode
1992 * @NL80211_STA_INFO_NONPEER_PM: neighbor mesh STA power save mode towards2001 * @NL80211_STA_INFO_NONPEER_PM: neighbor mesh STA power save mode towards
1993 * non-peer STA2002 * 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 * @__NL80211_STA_INFO_AFTER_LAST: internal2007 * @__NL80211_STA_INFO_AFTER_LAST: internal
1995 * @NL80211_STA_INFO_MAX: highest possible station info attribute2008 * @NL80211_STA_INFO_MAX: highest possible station info attribute
1996 */2009 */
@@ -2020,6 +2033,8 @@ enum nl80211_sta_info { · 23 unmodified lines
2020 NL80211_STA_INFO_NONPEER_PM,2033 NL80211_STA_INFO_NONPEER_PM,
2021 NL80211_STA_INFO_RX_BYTES64,2034 NL80211_STA_INFO_RX_BYTES64,
2022 NL80211_STA_INFO_TX_BYTES64,2035 NL80211_STA_INFO_TX_BYTES64,
2036 NL80211_STA_INFO_CHAIN_SIGNAL,
2037 NL80211_STA_INFO_CHAIN_SIGNAL_AVG,
2023 2038
2024 /* keep last */2039 /* keep last */
2025 __NL80211_STA_INFO_AFTER_LAST,2040 __NL80211_STA_INFO_AFTER_LAST,
@@ -2413,6 +2428,8 @@ enum nl80211_survey_info { · 387 unmodified lines
2413 * @NL80211_MNTR_FLAG_OTHER_BSS: disable BSSID filtering2428 * @NL80211_MNTR_FLAG_OTHER_BSS: disable BSSID filtering
2414 * @NL80211_MNTR_FLAG_COOK_FRAMES: report frames after processing.2429 * @NL80211_MNTR_FLAG_COOK_FRAMES: report frames after processing.
2415 * overrides all other flags.2430 * overrides all other flags.
2431 * @NL80211_MNTR_FLAG_ACTIVE: use the configured MAC address
2432 * and ACK incoming unicast packets.
2416 *2433 *
2417 * @__NL80211_MNTR_FLAG_AFTER_LAST: internal use2434 * @__NL80211_MNTR_FLAG_AFTER_LAST: internal use
2418 * @NL80211_MNTR_FLAG_MAX: highest possible monitor flag2435 * @NL80211_MNTR_FLAG_MAX: highest possible monitor flag
@@ -2424,6 +2441,7 @@ enum nl80211_mntr_flags { · 5 unmodified lines
2424 NL80211_MNTR_FLAG_CONTROL,2441 NL80211_MNTR_FLAG_CONTROL,
2425 NL80211_MNTR_FLAG_OTHER_BSS,2442 NL80211_MNTR_FLAG_OTHER_BSS,
2426 NL80211_MNTR_FLAG_COOK_FRAMES,2443 NL80211_MNTR_FLAG_COOK_FRAMES,
2444 NL80211_MNTR_FLAG_ACTIVE,
2427 2445
2428 /* keep last */2446 /* keep last */
2429 __NL80211_MNTR_FLAG_AFTER_LAST,2447 __NL80211_MNTR_FLAG_AFTER_LAST,
@@ -2559,6 +2577,10 @@ enum nl80211_mesh_power_mode { · 129 unmodified lines
2559 *2577 *
2560 * @NL80211_MESHCONF_AWAKE_WINDOW: awake window duration (in TUs)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 * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use2584 * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
2563 */2585 */
2564enum nl80211_meshconf_params {2586enum nl80211_meshconf_params {
@@ -2590,6 +2612,7 @@ enum nl80211_meshconf_params { · 25 unmodified lines
2590 NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,2612 NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,
2591 NL80211_MESHCONF_POWER_MODE,2613 NL80211_MESHCONF_POWER_MODE,
2592 NL80211_MESHCONF_AWAKE_WINDOW,2614 NL80211_MESHCONF_AWAKE_WINDOW,
2615 NL80211_MESHCONF_PLINK_TIMEOUT,
2593 2616
2594 /* keep last */2617 /* keep last */
2595 __NL80211_MESHCONF_ATTR_AFTER_LAST,2618 __NL80211_MESHCONF_ATTR_AFTER_LAST,
@@ -2637,6 +2660,10 @@ enum nl80211_meshconf_params { · 41 unmodified lines
2637 * @NL80211_MESH_SETUP_USERSPACE_MPM: Enable this option if userspace will2660 * @NL80211_MESH_SETUP_USERSPACE_MPM: Enable this option if userspace will
2638 * implement an MPM which handles peer allocation and state.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 * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number2667 * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number
2641 *2668 *
2642 * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use2669 * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use
@@ -2650,6 +2677,7 @@ enum nl80211_mesh_setup_params { · 7 unmodified lines
2650 NL80211_MESH_SETUP_USERSPACE_AMPE,2677 NL80211_MESH_SETUP_USERSPACE_AMPE,
2651 NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC,2678 NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC,
2652 NL80211_MESH_SETUP_USERSPACE_MPM,2679 NL80211_MESH_SETUP_USERSPACE_MPM,
2680 NL80211_MESH_SETUP_AUTH_PROTOCOL,
2653 2681
2654 /* keep last */2682 /* keep last */
2655 __NL80211_MESH_SETUP_ATTR_AFTER_LAST,2683 __NL80211_MESH_SETUP_ATTR_AFTER_LAST,
@@ -2730,6 +2758,8 @@ enum nl80211_channel_type { · 74 unmodified lines
2730 * and %NL80211_ATTR_CENTER_FREQ2 attributes must be provided as well2758 * and %NL80211_ATTR_CENTER_FREQ2 attributes must be provided as well
2731 * @NL80211_CHAN_WIDTH_160: 160 MHz channel, the %NL80211_ATTR_CENTER_FREQ12759 * @NL80211_CHAN_WIDTH_160: 160 MHz channel, the %NL80211_ATTR_CENTER_FREQ1
2732 * attribute must be provided as well2760 * 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 */
2734enum nl80211_chan_width {2764enum nl80211_chan_width {
2735 NL80211_CHAN_WIDTH_20_NOHT,2765 NL80211_CHAN_WIDTH_20_NOHT,
@@ -2738,6 +2768,8 @@ enum nl80211_chan_width { · 2 unmodified lines
2738 NL80211_CHAN_WIDTH_80,2768 NL80211_CHAN_WIDTH_80,
2739 NL80211_CHAN_WIDTH_80P80,2769 NL80211_CHAN_WIDTH_80P80,
2740 NL80211_CHAN_WIDTH_160,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 * Peering Management entity which may be implemented by registering for3588 * Peering Management entity which may be implemented by registering for
3557 * beacons or NL80211_CMD_NEW_PEER_CANDIDATE events. The mesh beacon is3589 * beacons or NL80211_CMD_NEW_PEER_CANDIDATE events. The mesh beacon is
3558 * still generated by the driver.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 */
3560enum nl80211_feature_flags {3596enum nl80211_feature_flags {
3561 NL80211_FEATURE_SK_TX_STATUS = 1 << 0,3597 NL80211_FEATURE_SK_TX_STATUS = 1 << 0,
@@ -3575,6 +3611,7 @@ enum nl80211_feature_flags { · 13 unmodified lines
3575 NL80211_FEATURE_ADVERTISE_CHAN_LIMITS = 1 << 14,3611 NL80211_FEATURE_ADVERTISE_CHAN_LIMITS = 1 << 14,
3576 NL80211_FEATURE_FULL_AP_CLIENT_STATE = 1 << 15,3612 NL80211_FEATURE_FULL_AP_CLIENT_STATE = 1 << 15,
3577 NL80211_FEATURE_USERSPACE_MPM = 1 << 16,3613 NL80211_FEATURE_USERSPACE_MPM = 1 << 16,
3614 NL80211_FEATURE_ACTIVE_MONITOR = 1 << 17,
3578};3615};
3579 3616
3580/**3617/**
include/uapi/linux/openvswitch.h+19−1
@@ -164,6 +164,7 @@ enum ovs_vport_type { · 163 unmodified lines
164 OVS_VPORT_TYPE_UNSPEC,164 OVS_VPORT_TYPE_UNSPEC,
165 OVS_VPORT_TYPE_NETDEV, /* network device */165 OVS_VPORT_TYPE_NETDEV, /* network device */
166 OVS_VPORT_TYPE_INTERNAL, /* network device implemented by datapath */166 OVS_VPORT_TYPE_INTERNAL, /* network device implemented by datapath */
167 OVS_VPORT_TYPE_GRE, /* GRE tunnel. */
167 __OVS_VPORT_TYPE_MAX168 __OVS_VPORT_TYPE_MAX
168};169};
169 170
@@ -192,7 +193,6 @@ enum ovs_vport_type { · 22 unmodified lines
192 * optional; if not specified a free port number is automatically selected.193 * optional; if not specified a free port number is automatically selected.
193 * Whether %OVS_VPORT_ATTR_OPTIONS is required or optional depends on the type194 * Whether %OVS_VPORT_ATTR_OPTIONS is required or optional depends on the type
194 * of vport.195 * of vport.
195 * and other attributes are ignored.
196 *196 *
197 * For other requests, if %OVS_VPORT_ATTR_NAME is specified then it is used to197 * For other requests, if %OVS_VPORT_ATTR_NAME is specified then it is used to
198 * look up the vport to operate on; otherwise dp_idx from the &struct198 * 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 OVS_KEY_ATTR_ARP, /* struct ovs_key_arp */247 OVS_KEY_ATTR_ARP, /* struct ovs_key_arp */
248 OVS_KEY_ATTR_ND, /* struct ovs_key_nd */248 OVS_KEY_ATTR_ND, /* struct ovs_key_nd */
249 OVS_KEY_ATTR_SKB_MARK, /* u32 skb mark */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 __OVS_KEY_ATTR_MAX255 __OVS_KEY_ATTR_MAX
251};256};
252 257
253#define OVS_KEY_ATTR_MAX (__OVS_KEY_ATTR_MAX - 1)258#define OVS_KEY_ATTR_MAX (__OVS_KEY_ATTR_MAX - 1)
254 259
260enum 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 * enum ovs_frag_type - IPv4 and IPv6 fragment type274 * enum ovs_frag_type - IPv4 and IPv6 fragment type
257 * @OVS_FRAG_TYPE_NONE: Packet is not a fragment.275 * @OVS_FRAG_TYPE_NONE: Packet is not a fragment.
include/uapi/linux/pci_regs.h+1−1
@@ -468,7 +468,7 @@ · 467 unmodified lines
468#define PCI_EXP_LNKCAP_ASPMS 0x00000c00 /* ASPM Support */468#define PCI_EXP_LNKCAP_ASPMS 0x00000c00 /* ASPM Support */
469#define PCI_EXP_LNKCAP_L0SEL 0x00007000 /* L0s Exit Latency */469#define PCI_EXP_LNKCAP_L0SEL 0x00007000 /* L0s Exit Latency */
470#define PCI_EXP_LNKCAP_L1EL 0x00038000 /* L1 Exit Latency */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#define PCI_EXP_LNKCAP_SDERC 0x00080000 /* Surprise Down Error Reporting Capable */472#define PCI_EXP_LNKCAP_SDERC 0x00080000 /* Surprise Down Error Reporting Capable */
473#define PCI_EXP_LNKCAP_DLLLARC 0x00100000 /* Data Link Layer Link Active Reporting Capable */473#define PCI_EXP_LNKCAP_DLLLARC 0x00100000 /* Data Link Layer Link Active Reporting Capable */
474#define PCI_EXP_LNKCAP_LBNC 0x00200000 /* Link Bandwidth Notification Capability */474#define PCI_EXP_LNKCAP_LBNC 0x00200000 /* Link Bandwidth Notification Capability */
include/uapi/linux/perf_event.h+4−1
@@ -157,8 +157,11 @@ enum perf_branch_sample_type { · 156 unmodified lines
157 PERF_SAMPLE_BRANCH_ANY_CALL = 1U << 4, /* any call branch */157 PERF_SAMPLE_BRANCH_ANY_CALL = 1U << 4, /* any call branch */
158 PERF_SAMPLE_BRANCH_ANY_RETURN = 1U << 5, /* any return branch */158 PERF_SAMPLE_BRANCH_ANY_RETURN = 1U << 5, /* any return branch */
159 PERF_SAMPLE_BRANCH_IND_CALL = 1U << 6, /* indirect calls */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#define PERF_SAMPLE_BRANCH_PLM_ALL \167#define PERF_SAMPLE_BRANCH_PLM_ALL \
include/uapi/linux/ptrace.h+3−0
@@ -61,6 +61,9 @@ struct ptrace_peeksiginfo_args { · 60 unmodified lines
61 __s32 nr; /* how may siginfos to take */61 __s32 nr; /* how may siginfos to take */
62};62};
63 63
64#define PTRACE_GETSIGMASK 0x420a
65#define PTRACE_SETSIGMASK 0x420b
66
64/* Read signals from a shared (process wide) queue */67/* Read signals from a shared (process wide) queue */
65#define PTRACE_PEEKSIGINFO_SHARED (1 << 0)68#define PTRACE_PEEKSIGINFO_SHARED (1 << 0)
66 69
include/uapi/linux/rtnetlink.h+2−0
@@ -386,6 +386,8 @@ enum { · 385 unmodified lines
386#define RTAX_RTO_MIN RTAX_RTO_MIN386#define RTAX_RTO_MIN RTAX_RTO_MIN
387 RTAX_INITRWND,387 RTAX_INITRWND,
388#define RTAX_INITRWND RTAX_INITRWND388#define RTAX_INITRWND RTAX_INITRWND
389 RTAX_QUICKACK,
390#define RTAX_QUICKACK RTAX_QUICKACK
389 __RTAX_MAX391 __RTAX_MAX
390};392};
391 393
include/uapi/linux/serial_core.h+6−0
@@ -226,4 +226,10 @@ · 225 unmodified lines
226/* Rocketport EXPRESS/INFINITY */226/* Rocketport EXPRESS/INFINITY */
227#define PORT_RP2 102227#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#endif /* _UAPILINUX_SERIAL_CORE_H */235#endif /* _UAPILINUX_SERIAL_CORE_H */
include/uapi/linux/snmp.h+2−0
@@ -253,6 +253,7 @@ enum · 252 unmodified lines
253 LINUX_MIB_TCPFASTOPENLISTENOVERFLOW, /* TCPFastOpenListenOverflow */253 LINUX_MIB_TCPFASTOPENLISTENOVERFLOW, /* TCPFastOpenListenOverflow */
254 LINUX_MIB_TCPFASTOPENCOOKIEREQD, /* TCPFastOpenCookieReqd */254 LINUX_MIB_TCPFASTOPENCOOKIEREQD, /* TCPFastOpenCookieReqd */
255 LINUX_MIB_TCPSPURIOUS_RTX_HOSTQUEUES, /* TCPSpuriousRtxHostQueues */255 LINUX_MIB_TCPSPURIOUS_RTX_HOSTQUEUES, /* TCPSpuriousRtxHostQueues */
256 LINUX_MIB_LOWLATENCYRXPACKETS, /* LowLatencyRxPackets */
256 __LINUX_MIB_MAX257 __LINUX_MIB_MAX
257};258};
258 259
@@ -287,6 +288,7 @@ enum · 28 unmodified lines
287 LINUX_MIB_XFRMOUTPOLERROR, /* XfrmOutPolError */288 LINUX_MIB_XFRMOUTPOLERROR, /* XfrmOutPolError */
288 LINUX_MIB_XFRMFWDHDRERROR, /* XfrmFwdHdrError*/289 LINUX_MIB_XFRMFWDHDRERROR, /* XfrmFwdHdrError*/
289 LINUX_MIB_XFRMOUTSTATEINVALID, /* XfrmOutStateInvalid */290 LINUX_MIB_XFRMOUTSTATEINVALID, /* XfrmOutStateInvalid */
291 LINUX_MIB_XFRMACQUIREERROR, /* XfrmAcquireError */
290 __LINUX_MIB_XFRMMAX292 __LINUX_MIB_XFRMMAX
291};293};
292 294
include/uapi/linux/tipc.h+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * include/linux/tipc.h: Include file for TIPC socket interface2 * include/uapi/linux/tipc.h: Header for TIPC socket interface
3 *3 *
4 * Copyright (c) 2003-2006, Ericsson AB4 * Copyright (c) 2003-2006, Ericsson AB
5 * Copyright (c) 2005, 2010-2011, Wind River Systems5 * Copyright (c) 2005, 2010-2011, Wind River Systems
include/uapi/linux/tipc_config.h+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * include/linux/tipc_config.h: Include file for TIPC configuration interface2 * include/uapi/linux/tipc_config.h: Header for TIPC configuration interface
3 *3 *
4 * Copyright (c) 2003-2006, Ericsson AB4 * Copyright (c) 2003-2006, Ericsson AB
5 * Copyright (c) 2005-2007, 2010-2011, Wind River Systems5 * Copyright (c) 2005-2007, 2010-2011, Wind River Systems
include/uapi/linux/v4l2-controls.h+2−2
@@ -53,13 +53,13 @@ · 52 unmodified lines
53#define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */53#define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */
54#define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */54#define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */
55#define V4L2_CTRL_CLASS_CAMERA 0x009a0000 /* Camera class controls */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#define V4L2_CTRL_CLASS_FLASH 0x009c0000 /* Camera flash controls */57#define V4L2_CTRL_CLASS_FLASH 0x009c0000 /* Camera flash controls */
58#define V4L2_CTRL_CLASS_JPEG 0x009d0000 /* JPEG-compression controls */58#define V4L2_CTRL_CLASS_JPEG 0x009d0000 /* JPEG-compression controls */
59#define V4L2_CTRL_CLASS_IMAGE_SOURCE 0x009e0000 /* Image source controls */59#define V4L2_CTRL_CLASS_IMAGE_SOURCE 0x009e0000 /* Image source controls */
60#define V4L2_CTRL_CLASS_IMAGE_PROC 0x009f0000 /* Image processing controls */60#define V4L2_CTRL_CLASS_IMAGE_PROC 0x009f0000 /* Image processing controls */
61#define V4L2_CTRL_CLASS_DV 0x00a00000 /* Digital Video controls */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/* User-class control IDs */64/* User-class control IDs */
65 65
include/uapi/linux/vfio.h+40−2
@@ -22,6 +22,7 @@ · 21 unmodified lines
22/* Extensions */22/* Extensions */
23 23
24#define VFIO_TYPE1_IOMMU 124#define VFIO_TYPE1_IOMMU 1
25#define VFIO_SPAPR_TCE_IOMMU 2
25 26
26/*27/*
27 * The IOCTL interface is designed for extensibility by embedding the28 * The IOCTL interface is designed for extensibility by embedding the
@@ -361,10 +362,14 @@ struct vfio_iommu_type1_dma_map { · 333 unmodified lines
361#define VFIO_IOMMU_MAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 13)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 * Unmap IO virtual addresses using the provided struct vfio_dma_unmap.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 */
369struct vfio_iommu_type1_dma_unmap {374struct vfio_iommu_type1_dma_unmap {
370 __u32 argsz;375 __u32 argsz;
@@ -375,4 +380,37 @@ struct vfio_iommu_type1_dma_unmap { · 4 unmodified lines
375 380
376#define VFIO_IOMMU_UNMAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 14)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 */
405struct 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#endif /* _UAPIVFIO_H */416#endif /* _UAPIVFIO_H */
include/uapi/linux/videodev2.h+8−19
@@ -395,7 +395,7 @@ struct v4l2_pix_format { · 394 unmodified lines
395#define V4L2_PIX_FMT_H263 v4l2_fourcc('H', '2', '6', '3') /* H263 */395#define V4L2_PIX_FMT_H263 v4l2_fourcc('H', '2', '6', '3') /* H263 */
396#define V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES */396#define V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES */
397#define V4L2_PIX_FMT_MPEG2 v4l2_fourcc('M', 'P', 'G', '2') /* MPEG-2 ES */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#define V4L2_PIX_FMT_XVID v4l2_fourcc('X', 'V', 'I', 'D') /* Xvid */399#define V4L2_PIX_FMT_XVID v4l2_fourcc('X', 'V', 'I', 'D') /* Xvid */
400#define V4L2_PIX_FMT_VC1_ANNEX_G v4l2_fourcc('V', 'C', '1', 'G') /* SMPTE 421M Annex G compliant stream */400#define V4L2_PIX_FMT_VC1_ANNEX_G v4l2_fourcc('V', 'C', '1', 'G') /* SMPTE 421M Annex G compliant stream */
401#define V4L2_PIX_FMT_VC1_ANNEX_L v4l2_fourcc('V', 'C', '1', 'L') /* SMPTE 421M Annex L compliant stream */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 __u32 jpeg_markers; /* Which markers should go into the JPEG555 __u32 jpeg_markers; /* Which markers should go into the JPEG
556 * output. Unless you exactly know what556 * output. Unless you exactly know what
557 * you do, leave them untouched.557 * you do, leave them untouched.
558 * Inluding less markers will make the558 * Including less markers will make the
559 * resulting code smaller, but there will559 * resulting code smaller, but there will
560 * be fewer applications which can read it.560 * be fewer applications which can read it.
561 * The presence of the APP and COM marker561 * The presence of the APP and COM marker
@@ -567,7 +567,7 @@ struct v4l2_jpegcompression { · 5 unmodified lines
567#define V4L2_JPEG_MARKER_DRI (1<<5) /* Define Restart Interval */567#define V4L2_JPEG_MARKER_DRI (1<<5) /* Define Restart Interval */
568#define V4L2_JPEG_MARKER_COM (1<<6) /* Comment segment */568#define V4L2_JPEG_MARKER_COM (1<<6) /* Comment segment */
569#define V4L2_JPEG_MARKER_APP (1<<7) /* App segment, driver will569#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 * "Common" PAL - This macro is there to be compatible with the old901 * "Common" PAL - This macro is there to be compatible with the old
902 * V4L1 concept of "PAL": /BGDKHI.902 * V4L1 concept of "PAL": /BGDKHI.
903 * Several PAL standards are mising here: /M, /N and /Nc903 * Several PAL standards are missing here: /M, /N and /Nc
904 */904 */
905#define V4L2_STD_PAL (V4L2_STD_PAL_BG |\905#define V4L2_STD_PAL (V4L2_STD_PAL_BG |\
906 V4L2_STD_PAL_DK |\906 V4L2_STD_PAL_DK |\
@@ -1787,11 +1787,13 @@ struct v4l2_event_subscription { · 880 unmodified lines
1787/* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */1787/* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */
1788 1788
1789#define V4L2_CHIP_MATCH_BRIDGE 0 /* Match against chip ID on the bridge (0 for the bridge) */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#define V4L2_CHIP_MATCH_HOST V4L2_CHIP_MATCH_BRIDGE1793#define V4L2_CHIP_MATCH_HOST V4L2_CHIP_MATCH_BRIDGE
1791#define V4L2_CHIP_MATCH_I2C_DRIVER 1 /* Match against I2C driver name */1794#define V4L2_CHIP_MATCH_I2C_DRIVER 1 /* Match against I2C driver name */
1792#define V4L2_CHIP_MATCH_I2C_ADDR 2 /* Match against I2C 7-bit address */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 */1796#define V4L2_CHIP_MATCH_AC97 3 /* Match against ancillary AC97 chip */
1794#define V4L2_CHIP_MATCH_SUBDEV 4 /* Match against subdev index */
1795 1797
1796struct v4l2_dbg_match {1798struct v4l2_dbg_match {
1797 __u32 type; /* Match type */1799 __u32 type; /* Match type */
@@ -1808,13 +1810,6 @@ struct v4l2_dbg_register { · 10 unmodified lines
1808 __u64 val;1810 __u64 val;
1809} __attribute__ ((packed));1811} __attribute__ ((packed));
1810 1812
1811/* VIDIOC_DBG_G_CHIP_IDENT */
1812struct 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#define V4L2_CHIP_FL_READABLE (1 << 0)1813#define V4L2_CHIP_FL_READABLE (1 << 0)
1819#define V4L2_CHIP_FL_WRITABLE (1 << 1)1814#define V4L2_CHIP_FL_WRITABLE (1 << 1)
1820 1815
@@ -1915,12 +1910,6 @@ struct v4l2_create_buffers { · 94 unmodified lines
1915#define VIDIOC_DBG_S_REGISTER _IOW('V', 79, struct v4l2_dbg_register)1910#define VIDIOC_DBG_S_REGISTER _IOW('V', 79, struct v4l2_dbg_register)
1916#define VIDIOC_DBG_G_REGISTER _IOWR('V', 80, struct v4l2_dbg_register)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#define VIDIOC_S_HW_FREQ_SEEK _IOW('V', 82, struct v4l2_hw_freq_seek)1913#define VIDIOC_S_HW_FREQ_SEEK _IOW('V', 82, struct v4l2_hw_freq_seek)
1925 1914
1926#define VIDIOC_S_DV_TIMINGS _IOWR('V', 87, struct v4l2_dv_timings)1915#define VIDIOC_S_DV_TIMINGS _IOWR('V', 87, struct v4l2_dv_timings)
include/uapi/linux/virtio_config.h+3−0
@@ -51,4 +51,7 @@ · 50 unmodified lines
51 * suppressed them? */51 * suppressed them? */
52#define VIRTIO_F_NOTIFY_ON_EMPTY 2452#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#endif /* _UAPI_LINUX_VIRTIO_CONFIG_H */57#endif /* _UAPI_LINUX_VIRTIO_CONFIG_H */
include/uapi/linux/virtio_console.h+3−0
@@ -38,6 +38,7 @@ · 37 unmodified lines
38/* Feature bits */38/* Feature bits */
39#define VIRTIO_CONSOLE_F_SIZE 0 /* Does host provide console size? */39#define VIRTIO_CONSOLE_F_SIZE 0 /* Does host provide console size? */
40#define VIRTIO_CONSOLE_F_MULTIPORT 1 /* Does host provide multiple ports? */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#define VIRTIO_CONSOLE_BAD_ID (~(__u32)0)43#define VIRTIO_CONSOLE_BAD_ID (~(__u32)0)
43 44
@@ -48,6 +49,8 @@ struct virtio_console_config { · 4 unmodified lines
48 __u16 rows;49 __u16 rows;
49 /* max. number of ports this device can hold */50 /* max. number of ports this device can hold */
50 __u32 max_nr_ports;51 __u32 max_nr_ports;
52 /* emergency write register */
53 __u32 emerg_wr;
51} __attribute__((packed));54} __attribute__((packed));
52 55
53/*56/*
include/uapi/linux/virtio_pci.h+3−1
@@ -80,7 +80,9 @@ · 79 unmodified lines
80 80
81/* The remaining space is defined by each driver as the per-driver81/* The remaining space is defined by each driver as the per-driver
82 * configuration space */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/* Virtio ABI version, this must match exactly */87/* Virtio ABI version, this must match exactly */
86#define VIRTIO_PCI_ABI_VERSION 088#define VIRTIO_PCI_ABI_VERSION 0
include/uapi/mtd/ubi-user.h+4−1
@@ -173,7 +173,10 @@ · 172 unmodified lines
173 173
174#define UBI_VOL_IOC_MAGIC 'O'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#define UBI_IOCVOLUP _IOW(UBI_VOL_IOC_MAGIC, 0, __s64)180#define UBI_IOCVOLUP _IOW(UBI_VOL_IOC_MAGIC, 0, __s64)
178/* LEB erasure command, used for debugging, disabled by default */181/* LEB erasure command, used for debugging, disabled by default */
179#define UBI_IOCEBER _IOW(UBI_VOL_IOC_MAGIC, 1, __s32)182#define UBI_IOCEBER _IOW(UBI_VOL_IOC_MAGIC, 1, __s32)
include/uapi/rdma/rdma_user_cm.h+63−10
@@ -45,8 +45,8 @@ · 44 unmodified lines
45enum {45enum {
46 RDMA_USER_CM_CMD_CREATE_ID,46 RDMA_USER_CM_CMD_CREATE_ID,
47 RDMA_USER_CM_CMD_DESTROY_ID,47 RDMA_USER_CM_CMD_DESTROY_ID,
48 RDMA_USER_CM_CMD_BIND_ADDR,48 RDMA_USER_CM_CMD_BIND_IP,
49 RDMA_USER_CM_CMD_RESOLVE_ADDR,49 RDMA_USER_CM_CMD_RESOLVE_IP,
50 RDMA_USER_CM_CMD_RESOLVE_ROUTE,50 RDMA_USER_CM_CMD_RESOLVE_ROUTE,
51 RDMA_USER_CM_CMD_QUERY_ROUTE,51 RDMA_USER_CM_CMD_QUERY_ROUTE,
52 RDMA_USER_CM_CMD_CONNECT,52 RDMA_USER_CM_CMD_CONNECT,
@@ -59,9 +59,13 @@ enum { · 6 unmodified lines
59 RDMA_USER_CM_CMD_GET_OPTION,59 RDMA_USER_CM_CMD_GET_OPTION,
60 RDMA_USER_CM_CMD_SET_OPTION,60 RDMA_USER_CM_CMD_SET_OPTION,
61 RDMA_USER_CM_CMD_NOTIFY,61 RDMA_USER_CM_CMD_NOTIFY,
62 RDMA_USER_CM_CMD_JOIN_MCAST,62 RDMA_USER_CM_CMD_JOIN_IP_MCAST,
63 RDMA_USER_CM_CMD_LEAVE_MCAST,63 RDMA_USER_CM_CMD_LEAVE_MCAST,
64 RDMA_USER_CM_CMD_MIGRATE_ID64 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 __u32 events_reported;99 __u32 events_reported;
96};100};
97 101
98struct rdma_ucm_bind_addr {102struct rdma_ucm_bind_ip {
99 __u64 response;103 __u64 response;
100 struct sockaddr_in6 addr;104 struct sockaddr_in6 addr;
101 __u32 id;105 __u32 id;
102};106};
103 107
104struct rdma_ucm_resolve_addr {108struct rdma_ucm_bind {
109 __u32 id;
110 __u16 addr_size;
111 __u16 reserved;
112 struct sockaddr_storage addr;
113};
114
115struct rdma_ucm_resolve_ip {
105 struct sockaddr_in6 src_addr;116 struct sockaddr_in6 src_addr;
106 struct sockaddr_in6 dst_addr;117 struct sockaddr_in6 dst_addr;
107 __u32 id;118 __u32 id;
108 __u32 timeout_ms;119 __u32 timeout_ms;
109};120};
110 121
122struct 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
111struct rdma_ucm_resolve_route {132struct rdma_ucm_resolve_route {
112 __u32 id;133 __u32 id;
113 __u32 timeout_ms;134 __u32 timeout_ms;
114};135};
115 136
116struct rdma_ucm_query_route {137enum {
138 RDMA_USER_CM_QUERY_ADDR,
139 RDMA_USER_CM_QUERY_PATH,
140 RDMA_USER_CM_QUERY_GID
141};
142
143struct rdma_ucm_query {
117 __u64 response;144 __u64 response;
118 __u32 id;145 __u32 id;
119 __u32 reserved;146 __u32 option;
120};147};
121 148
122struct rdma_ucm_query_route_resp {149struct rdma_ucm_query_route_resp {
@@ -129,9 +156,26 @@ struct rdma_ucm_query_route_resp { · 6 unmodified lines
129 __u8 reserved[3];156 __u8 reserved[3];
130};157};
131 158
159struct 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
170struct rdma_ucm_query_path_resp {
171 __u32 num_paths;
172 __u32 reserved;
173 struct ib_path_rec_data path_data[0];
174};
175
132struct rdma_ucm_conn_param {176struct rdma_ucm_conn_param {
133 __u32 qp_num;177 __u32 qp_num;
134 __u32 reserved;178 __u32 qkey;
135 __u8 private_data[RDMA_MAX_PRIVATE_DATA];179 __u8 private_data[RDMA_MAX_PRIVATE_DATA];
136 __u8 private_data_len;180 __u8 private_data_len;
137 __u8 srq;181 __u8 srq;
@@ -192,13 +236,22 @@ struct rdma_ucm_notify { · 54 unmodified lines
192 __u32 event;236 __u32 event;
193};237};
194 238
195struct rdma_ucm_join_mcast {239struct rdma_ucm_join_ip_mcast {
196 __u64 response; /* rdma_ucm_create_id_resp */240 __u64 response; /* rdma_ucm_create_id_resp */
197 __u64 uid;241 __u64 uid;
198 struct sockaddr_in6 addr;242 struct sockaddr_in6 addr;
199 __u32 id;243 __u32 id;
200};244};
201 245
246struct 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
202struct rdma_ucm_get_event {255struct rdma_ucm_get_event {
203 __u64 response;256 __u64 response;
204};257};
include/uapi/sound/asound.h+2−0
@@ -817,6 +817,8 @@ typedef int __bitwise snd_ctl_elem_iface_t; · 816 unmodified lines
817#define SNDRV_CTL_POWER_D3hot (SNDRV_CTL_POWER_D3|0x0000) /* Off, with power */817#define SNDRV_CTL_POWER_D3hot (SNDRV_CTL_POWER_D3|0x0000) /* Off, with power */
818#define SNDRV_CTL_POWER_D3cold (SNDRV_CTL_POWER_D3|0x0001) /* Off, without power */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
820struct snd_ctl_elem_id {822struct snd_ctl_elem_id {
821 unsigned int numid; /* numeric identifier, zero = invalid */823 unsigned int numid; /* numeric identifier, zero = invalid */
822 snd_ctl_elem_iface_t iface; /* interface identifier */824 snd_ctl_elem_iface_t iface; /* interface identifier */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t