Simple overlapping changes in stmmac driver. Adjust skb_gro_flush_final_remcsum function signature to make GRO list changes in net-next, as per Stephen Rothwell's example merge resolution.
Showing the changes to include/uapi/linux (3 of 471 files). Show all
Unified · Split
| @@ -39,8 +39,10 @@ enum { · 38 unmodified lines | ||
| 39 | 39 | IOCB_CMD_PWRITE = 1, |
| 40 | 40 | IOCB_CMD_FSYNC = 2, |
| 41 | 41 | IOCB_CMD_FDSYNC = 3, |
| 42 | − /* 4 was the experimental IOCB_CMD_PREADX */ | |
| 43 | − IOCB_CMD_POLL = 5, | |
| 42 | + /* These two are experimental. | |
| 43 | + * IOCB_CMD_PREADX = 4, | |
| 44 | + * IOCB_CMD_POLL = 5, | |
| 45 | + */ | |
| 44 | 46 | IOCB_CMD_NOOP = 6, |
| 45 | 47 | IOCB_CMD_PREADV = 7, |
| 46 | 48 | IOCB_CMD_PWRITEV = 8, |
| @@ -1857,7 +1857,8 @@ union bpf_attr { · 1856 unmodified lines | ||
| 1857 | 1857 | * is resolved), the nexthop address is returned in ipv4_dst |
| 1858 | 1858 | * or ipv6_dst based on family, smac is set to mac address of |
| 1859 | 1859 | * egress device, dmac is set to nexthop mac address, rt_metric |
| 1860 | − * is set to metric from route (IPv4/IPv6 only). | |
| 1860 | + * is set to metric from route (IPv4/IPv6 only), and ifindex | |
| 1861 | + * is set to the device index of the nexthop from the FIB lookup. | |
| 1861 | 1862 | * |
| 1862 | 1863 | * *plen* argument is the size of the passed in struct. |
| 1863 | 1864 | * *flags* argument can be a combination of one or more of the |
| @@ -1873,9 +1874,10 @@ union bpf_attr { · 9 unmodified lines | ||
| 1873 | 1874 | * *ctx* is either **struct xdp_md** for XDP programs or |
| 1874 | 1875 | * **struct sk_buff** tc cls_act programs. |
| 1875 | 1876 | * Return |
| 1876 | − * Egress device index on success, 0 if packet needs to continue | |
| 1877 | − * up the stack for further processing or a negative error in case | |
| 1878 | − * of failure. | |
| 1877 | + * * < 0 if any input argument is invalid | |
| 1878 | + * * 0 on success (packet is forwarded, nexthop neighbor exists) | |
| 1879 | + * * > 0 one of **BPF_FIB_LKUP_RET_** codes explaining why the | |
| 1880 | + * * packet is not forwarded or needs assist from full stack | |
| 1879 | 1881 | * |
| 1880 | 1882 | * int bpf_sock_hash_update(struct bpf_sock_ops_kern *skops, struct bpf_map *map, void *key, u64 flags) |
| 1881 | 1883 | * Description |
| @@ -2612,6 +2614,18 @@ struct bpf_raw_tracepoint_args { · 730 unmodified lines | ||
| 2612 | 2614 | #define BPF_FIB_LOOKUP_DIRECT BIT(0) |
| 2613 | 2615 | #define BPF_FIB_LOOKUP_OUTPUT BIT(1) |
| 2614 | 2616 | |
| 2617 | +enum { | |
| 2618 | + BPF_FIB_LKUP_RET_SUCCESS, /* lookup successful */ | |
| 2619 | + BPF_FIB_LKUP_RET_BLACKHOLE, /* dest is blackholed; can be dropped */ | |
| 2620 | + BPF_FIB_LKUP_RET_UNREACHABLE, /* dest is unreachable; can be dropped */ | |
| 2621 | + BPF_FIB_LKUP_RET_PROHIBIT, /* dest not allowed; can be dropped */ | |
| 2622 | + BPF_FIB_LKUP_RET_NOT_FWDED, /* packet is not forwarded */ | |
| 2623 | + BPF_FIB_LKUP_RET_FWD_DISABLED, /* fwding is not enabled on ingress */ | |
| 2624 | + BPF_FIB_LKUP_RET_UNSUPP_LWT, /* fwd requires encapsulation */ | |
| 2625 | + BPF_FIB_LKUP_RET_NO_NEIGH, /* no neighbor entry for nh */ | |
| 2626 | + BPF_FIB_LKUP_RET_FRAG_NEEDED, /* fragmentation required to fwd */ | |
| 2627 | +}; | |
| 2628 | + | |
| 2615 | 2629 | struct bpf_fib_lookup { |
| 2616 | 2630 | /* input: network family for lookup (AF_INET, AF_INET6) |
| 2617 | 2631 | * output: network family of egress nexthop |
| @@ -2625,7 +2639,11 @@ struct bpf_fib_lookup { · 7 unmodified lines | ||
| 2625 | 2639 | |
| 2626 | 2640 | /* total length of packet from network header - used for MTU check */ |
| 2627 | 2641 | __u16 tot_len; |
| 2628 | − __u32 ifindex; /* L3 device index for lookup */ | |
| 2642 | + | |
| 2643 | + /* input: L3 device index for lookup | |
| 2644 | + * output: device index from FIB lookup | |
| 2645 | + */ | |
| 2646 | + __u32 ifindex; | |
| 2629 | 2647 | |
| 2630 | 2648 | union { |
| 2631 | 2649 | /* inputs to lookup */ |
| @@ -44,6 +44,7 @@ · 43 unmodified lines | ||
| 44 | 44 | #define TCMU_MAILBOX_VERSION 2 |
| 45 | 45 | #define ALIGN_SIZE 64 /* Should be enough for most CPUs */ |
| 46 | 46 | #define TCMU_MAILBOX_FLAG_CAP_OOOC (1 << 0) /* Out-of-order completions */ |
| 47 | +#define TCMU_MAILBOX_FLAG_CAP_READ_LEN (1 << 1) /* Read data length */ | |
| 47 | 48 | |
| 48 | 49 | struct tcmu_mailbox { |
| 49 | 50 | __u16 version; |
| @@ -71,6 +72,7 @@ struct tcmu_cmd_entry_hdr { · 21 unmodified lines | ||
| 71 | 72 | __u16 cmd_id; |
| 72 | 73 | __u8 kflags; |
| 73 | 74 | #define TCMU_UFLAG_UNKNOWN_OP 0x1 |
| 75 | +#define TCMU_UFLAG_READ_LEN 0x2 | |
| 74 | 76 | __u8 uflags; |
| 75 | 77 | |
| 76 | 78 | } __packed; |
| @@ -119,7 +121,7 @@ struct tcmu_cmd_entry { · 42 unmodified lines | ||
| 119 | 121 | __u8 scsi_status; |
| 120 | 122 | __u8 __pad1; |
| 121 | 123 | __u16 __pad2; |
| 122 | − __u32 __pad3; | |
| 124 | + __u32 read_len; | |
| 123 | 125 | char sense_buffer[TCMU_SENSE_BUFFERSIZE]; |
| 124 | 126 | } rsp; |
| 125 | 127 | }; |