Resolve conflicts between 5888b93 ("Merge branch 'nf-hook-compress'") and Florian Westphal br_netfilter works. Conflicts: net/bridge/br_netfilter.c
Showing the changes to include/uapi (5 of 691 files). Show all
Unified · Split
| @@ -168,7 +168,43 @@ enum bpf_func_id { · 167 unmodified lines | |||
| 168 | BPF_FUNC_map_delete_elem, /* int map_delete_elem(&map, &key) */ | 168 | BPF_FUNC_map_delete_elem, /* int map_delete_elem(&map, &key) */ |
| 169 | BPF_FUNC_get_prandom_u32, /* u32 prandom_u32(void) */ | 169 | BPF_FUNC_get_prandom_u32, /* u32 prandom_u32(void) */ |
| 170 | BPF_FUNC_get_smp_processor_id, /* u32 raw_smp_processor_id(void) */ | 170 | BPF_FUNC_get_smp_processor_id, /* u32 raw_smp_processor_id(void) */ |
| 171 | BPF_FUNC_skb_store_bytes, /* int skb_store_bytes(skb, offset, from, len) */ | 171 | |
| 172 | /** | ||
| 173 | * skb_store_bytes(skb, offset, from, len, flags) - store bytes into packet | ||
| 174 | * @skb: pointer to skb | ||
| 175 | * @offset: offset within packet from skb->data | ||
| 176 | * @from: pointer where to copy bytes from | ||
| 177 | * @len: number of bytes to store into packet | ||
| 178 | * @flags: bit 0 - if true, recompute skb->csum | ||
| 179 | * other bits - reserved | ||
| 180 | * Return: 0 on success | ||
| 181 | */ | ||
| 182 | BPF_FUNC_skb_store_bytes, | ||
| 183 | |||
| 184 | /** | ||
| 185 | * l3_csum_replace(skb, offset, from, to, flags) - recompute IP checksum | ||
| 186 | * @skb: pointer to skb | ||
| 187 | * @offset: offset within packet where IP checksum is located | ||
| 188 | * @from: old value of header field | ||
| 189 | * @to: new value of header field | ||
| 190 | * @flags: bits 0-3 - size of header field | ||
| 191 | * other bits - reserved | ||
| 192 | * Return: 0 on success | ||
| 193 | */ | ||
| 194 | BPF_FUNC_l3_csum_replace, | ||
| 195 | |||
| 196 | /** | ||
| 197 | * l4_csum_replace(skb, offset, from, to, flags) - recompute TCP/UDP checksum | ||
| 198 | * @skb: pointer to skb | ||
| 199 | * @offset: offset within packet where TCP/UDP checksum is located | ||
| 200 | * @from: old value of header field | ||
| 201 | * @to: new value of header field | ||
| 202 | * @flags: bits 0-3 - size of header field | ||
| 203 | * bit 4 - is pseudo header | ||
| 204 | * other bits - reserved | ||
| 205 | * Return: 0 on success | ||
| 206 | */ | ||
| 207 | BPF_FUNC_l4_csum_replace, | ||
| 172 | __BPF_FUNC_MAX_ID, | 208 | __BPF_FUNC_MAX_ID, |
| 173 | }; | 209 | }; |
| 174 | 210 | ||
| @@ -184,6 +220,7 @@ struct __sk_buff { · 9 unmodified lines | |||
| 184 | __u32 vlan_present; | 220 | __u32 vlan_present; |
| 185 | __u32 vlan_tci; | 221 | __u32 vlan_tci; |
| 186 | __u32 vlan_proto; | 222 | __u32 vlan_proto; |
| 223 | __u32 priority; | ||
| 187 | }; | 224 | }; |
| 188 | 225 | ||
| 189 | #endif /* _UAPI__LINUX_BPF_H__ */ | 226 | #endif /* _UAPI__LINUX_BPF_H__ */ |
| @@ -57,6 +57,7 @@ enum { · 56 unmodified lines | |||
| 57 | CAN_RAW_LOOPBACK, /* local loopback (default:on) */ | 57 | CAN_RAW_LOOPBACK, /* local loopback (default:on) */ |
| 58 | CAN_RAW_RECV_OWN_MSGS, /* receive my own msgs (default:off) */ | 58 | CAN_RAW_RECV_OWN_MSGS, /* receive my own msgs (default:off) */ |
| 59 | CAN_RAW_FD_FRAMES, /* allow CAN FD frames (default:off) */ | 59 | CAN_RAW_FD_FRAMES, /* allow CAN FD frames (default:off) */ |
| 60 | CAN_RAW_JOIN_FILTERS, /* all filters must match to trigger */ | ||
| 60 | }; | 61 | }; |
| 61 | 62 | ||
| 62 | #endif /* !_UAPI_CAN_RAW_H */ | 63 | #endif /* !_UAPI_CAN_RAW_H */ |
| @@ -973,7 +973,8 @@ struct input_keymap_entry { · 972 unmodified lines | |||
| 973 | */ | 973 | */ |
| 974 | #define MT_TOOL_FINGER 0 | 974 | #define MT_TOOL_FINGER 0 |
| 975 | #define MT_TOOL_PEN 1 | 975 | #define MT_TOOL_PEN 1 |
| 976 | #define MT_TOOL_MAX 1 | 976 | #define MT_TOOL_PALM 2 |
| 977 | #define MT_TOOL_MAX 2 | ||
| 977 | 978 | ||
| 978 | /* | 979 | /* |
| 979 | * Values describing the status of a force-feedback effect | 980 | * Values describing the status of a force-feedback effect |
| @@ -47,7 +47,7 @@ · 46 unmodified lines | |||
| 47 | * exported filesystem. | 47 | * exported filesystem. |
| 48 | */ | 48 | */ |
| 49 | #define NFSEXP_V4ROOT 0x10000 | 49 | #define NFSEXP_V4ROOT 0x10000 |
| 50 | #define NFSEXP_NOPNFS 0x20000 | 50 | #define NFSEXP_PNFS 0x20000 |
| 51 | 51 | ||
| 52 | /* All flags that we claim to support. (Note we don't support NOACL.) */ | 52 | /* All flags that we claim to support. (Note we don't support NOACL.) */ |
| 53 | #define NFSEXP_ALLFLAGS 0x3FE7F | 53 | #define NFSEXP_ALLFLAGS 0x3FE7F |
| @@ -134,6 +134,8 @@ enum { · 133 unmodified lines | |||
| 134 | 134 | ||
| 135 | RTM_NEWNSID = 88, | 135 | RTM_NEWNSID = 88, |
| 136 | #define RTM_NEWNSID RTM_NEWNSID | 136 | #define RTM_NEWNSID RTM_NEWNSID |
| 137 | RTM_DELNSID = 89, | ||
| 138 | #define RTM_DELNSID RTM_DELNSID | ||
| 137 | RTM_GETNSID = 90, | 139 | RTM_GETNSID = 90, |
| 138 | #define RTM_GETNSID RTM_GETNSID | 140 | #define RTM_GETNSID RTM_GETNSID |
| 139 | 141 | ||
| @@ -635,6 +637,8 @@ enum rtnetlink_groups { · 495 unmodified lines | |||
| 635 | #define RTNLGRP_MDB RTNLGRP_MDB | 637 | #define RTNLGRP_MDB RTNLGRP_MDB |
| 636 | RTNLGRP_MPLS_ROUTE, | 638 | RTNLGRP_MPLS_ROUTE, |
| 637 | #define RTNLGRP_MPLS_ROUTE RTNLGRP_MPLS_ROUTE | 639 | #define RTNLGRP_MPLS_ROUTE RTNLGRP_MPLS_ROUTE |
| 640 | RTNLGRP_NSID, | ||
| 641 | #define RTNLGRP_NSID RTNLGRP_NSID | ||
| 638 | __RTNLGRP_MAX | 642 | __RTNLGRP_MAX |
| 639 | }; | 643 | }; |
| 640 | #define RTNLGRP_MAX (__RTNLGRP_MAX - 1) | 644 | #define RTNLGRP_MAX (__RTNLGRP_MAX - 1) |