We want the other staging patches in this branch as well.
Showing the changes to include/uapi (3 of 359 files). Show all
Unified · Split
| @@ -80,8 +80,10 @@ · 79 unmodified lines | ||
| 80 | 80 | * SA_RESTORER 0x04000000 |
| 81 | 81 | */ |
| 82 | 82 | |
| 83 | +#if !defined MINSIGSTKSZ || !defined SIGSTKSZ | |
| 83 | 84 | #define MINSIGSTKSZ 2048 |
| 84 | 85 | #define SIGSTKSZ 8192 |
| 86 | +#endif | |
| 85 | 87 | |
| 86 | 88 | #ifndef __ASSEMBLY__ |
| 87 | 89 | typedef struct { |
| @@ -323,10 +323,10 @@ enum ovs_key_attr { · 322 unmodified lines | ||
| 323 | 323 | OVS_KEY_ATTR_MPLS, /* array of struct ovs_key_mpls. |
| 324 | 324 | * The implementation may restrict |
| 325 | 325 | * the accepted length of the array. */ |
| 326 | − OVS_KEY_ATTR_CT_STATE, /* u8 bitmask of OVS_CS_F_* */ | |
| 326 | + OVS_KEY_ATTR_CT_STATE, /* u32 bitmask of OVS_CS_F_* */ | |
| 327 | 327 | OVS_KEY_ATTR_CT_ZONE, /* u16 connection tracking zone. */ |
| 328 | 328 | OVS_KEY_ATTR_CT_MARK, /* u32 connection tracking mark */ |
| 329 | − OVS_KEY_ATTR_CT_LABEL, /* 16-octet connection tracking label */ | |
| 329 | + OVS_KEY_ATTR_CT_LABELS, /* 16-octet connection tracking label */ | |
| 330 | 330 | |
| 331 | 331 | #ifdef __KERNEL__ |
| 332 | 332 | OVS_KEY_ATTR_TUNNEL_INFO, /* struct ip_tunnel_info */ |
| @@ -439,9 +439,9 @@ struct ovs_key_nd { · 106 unmodified lines | ||
| 439 | 439 | __u8 nd_tll[ETH_ALEN]; |
| 440 | 440 | }; |
| 441 | 441 | |
| 442 | −#define OVS_CT_LABEL_LEN 16 | |
| 443 | −struct ovs_key_ct_label { | |
| 444 | − __u8 ct_label[OVS_CT_LABEL_LEN]; | |
| 442 | +#define OVS_CT_LABELS_LEN 16 | |
| 443 | +struct ovs_key_ct_labels { | |
| 444 | + __u8 ct_labels[OVS_CT_LABELS_LEN]; | |
| 445 | 445 | }; |
| 446 | 446 | |
| 447 | 447 | /* OVS_KEY_ATTR_CT_STATE flags */ |
| @@ -449,9 +449,9 @@ struct ovs_key_ct_label { · 1 unmodified line | ||
| 449 | 449 | #define OVS_CS_F_ESTABLISHED 0x02 /* Part of an existing connection. */ |
| 450 | 450 | #define OVS_CS_F_RELATED 0x04 /* Related to an established |
| 451 | 451 | * connection. */ |
| 452 | −#define OVS_CS_F_INVALID 0x20 /* Could not track connection. */ | |
| 453 | −#define OVS_CS_F_REPLY_DIR 0x40 /* Flow is in the reply direction. */ | |
| 454 | −#define OVS_CS_F_TRACKED 0x80 /* Conntrack has occurred. */ | |
| 452 | +#define OVS_CS_F_REPLY_DIR 0x08 /* Flow is in the reply direction. */ | |
| 453 | +#define OVS_CS_F_INVALID 0x10 /* Could not track connection. */ | |
| 454 | +#define OVS_CS_F_TRACKED 0x20 /* Conntrack has occurred. */ | |
| 455 | 455 | |
| 456 | 456 | /** |
| 457 | 457 | * enum ovs_flow_attr - attributes for %OVS_FLOW_* commands. |
| @@ -618,22 +618,24 @@ struct ovs_action_hash { · 160 unmodified lines | ||
| 618 | 618 | |
| 619 | 619 | /** |
| 620 | 620 | * enum ovs_ct_attr - Attributes for %OVS_ACTION_ATTR_CT action. |
| 621 | − * @OVS_CT_ATTR_FLAGS: u32 connection tracking flags. | |
| 621 | + * @OVS_CT_ATTR_COMMIT: If present, commits the connection to the conntrack | |
| 622 | + * table. This allows future packets for the same connection to be identified | |
| 623 | + * as 'established' or 'related'. | |
| 622 | 624 | * @OVS_CT_ATTR_ZONE: u16 connection tracking zone. |
| 623 | 625 | * @OVS_CT_ATTR_MARK: u32 value followed by u32 mask. For each bit set in the |
| 624 | 626 | * mask, the corresponding bit in the value is copied to the connection |
| 625 | 627 | * tracking mark field in the connection. |
| 626 | − * @OVS_CT_ATTR_LABEL: %OVS_CT_LABEL_LEN value followed by %OVS_CT_LABEL_LEN | |
| 628 | + * @OVS_CT_ATTR_LABEL: %OVS_CT_LABELS_LEN value followed by %OVS_CT_LABELS_LEN | |
| 627 | 629 | * mask. For each bit set in the mask, the corresponding bit in the value is |
| 628 | 630 | * copied to the connection tracking label field in the connection. |
| 629 | 631 | * @OVS_CT_ATTR_HELPER: variable length string defining conntrack ALG. |
| 630 | 632 | */ |
| 631 | 633 | enum ovs_ct_attr { |
| 632 | 634 | OVS_CT_ATTR_UNSPEC, |
| 633 | − OVS_CT_ATTR_FLAGS, /* u8 bitmask of OVS_CT_F_*. */ | |
| 635 | + OVS_CT_ATTR_COMMIT, /* No argument, commits connection. */ | |
| 634 | 636 | OVS_CT_ATTR_ZONE, /* u16 zone id. */ |
| 635 | 637 | OVS_CT_ATTR_MARK, /* mark to associate with this connection. */ |
| 636 | − OVS_CT_ATTR_LABEL, /* label to associate with this connection. */ | |
| 638 | + OVS_CT_ATTR_LABELS, /* labels to associate with this connection. */ | |
| 637 | 639 | OVS_CT_ATTR_HELPER, /* netlink helper to assist detection of |
| 638 | 640 | related connections. */ |
| 639 | 641 | __OVS_CT_ATTR_MAX |
| @@ -641,14 +643,6 @@ enum ovs_ct_attr { · 1 unmodified line | ||
| 641 | 643 | |
| 642 | 644 | #define OVS_CT_ATTR_MAX (__OVS_CT_ATTR_MAX - 1) |
| 643 | 645 | |
| 644 | −/* | |
| 645 | − * OVS_CT_ATTR_FLAGS flags - bitmask of %OVS_CT_F_* | |
| 646 | − * @OVS_CT_F_COMMIT: Commits the flow to the conntrack table. This allows | |
| 647 | − * future packets for the same connection to be identified as 'established' | |
| 648 | − * or 'related'. | |
| 649 | − */ | |
| 650 | −#define OVS_CT_F_COMMIT 0x01 | |
| 651 | − | |
| 652 | 646 | /** |
| 653 | 647 | * enum ovs_action_attr - Action types. |
| 654 | 648 | * |
| @@ -705,7 +699,7 @@ enum ovs_action_attr { · 50 unmodified lines | ||
| 705 | 699 | * data immediately followed by a mask. |
| 706 | 700 | * The data must be zero for the unmasked |
| 707 | 701 | * bits. */ |
| 708 | − OVS_ACTION_ATTR_CT, /* One nested OVS_CT_ATTR_* . */ | |
| 702 | + OVS_ACTION_ATTR_CT, /* Nested OVS_CT_ATTR_* . */ | |
| 709 | 703 | |
| 710 | 704 | __OVS_ACTION_ATTR_MAX, /* Nothing past this will be accepted |
| 711 | 705 | * from userspace. */ |
| @@ -160,7 +160,7 @@ struct rtattr { · 159 unmodified lines | ||
| 160 | 160 | |
| 161 | 161 | /* Macros to handle rtattributes */ |
| 162 | 162 | |
| 163 | −#define RTA_ALIGNTO 4 | |
| 163 | +#define RTA_ALIGNTO 4U | |
| 164 | 164 | #define RTA_ALIGN(len) ( ((len)+RTA_ALIGNTO-1) & ~(RTA_ALIGNTO-1) ) |
| 165 | 165 | #define RTA_OK(rta,len) ((len) >= (int)sizeof(struct rtattr) && \ |
| 166 | 166 | (rta)->rta_len >= sizeof(struct rtattr) && \ |