Merge branch 'master' into net-next

This commit is contained in:
Stephen Hemminger 2017-10-31 18:03:12 +01:00
commit c1606c44b3
4 changed files with 6 additions and 5 deletions

View File

@ -645,7 +645,7 @@ union bpf_attr {
* @map: pointer to sockmap
* @key: key to lookup sock in map
* @flags: reserved for future use
* Return: SK_REDIRECT
* Return: SK_PASS
*
* int bpf_sock_map_update(skops, map, key, flags)
* @skops: pointer to bpf_sock_ops
@ -887,8 +887,8 @@ struct xdp_md {
};
enum sk_action {
SK_ABORTED = 0,
SK_DROP,
SK_DROP = 0,
SK_PASS,
SK_REDIRECT,
};

View File

@ -378,7 +378,7 @@ struct sctp_remote_error {
__u16 sre_type;
__u16 sre_flags;
__u32 sre_length;
__u16 sre_error;
__be16 sre_error;
sctp_assoc_t sre_assoc_id;
__u8 sre_data[0];
};

View File

@ -250,6 +250,7 @@ Link types:
.sp
.B bond
- Bonding device
.sp
.B can
- Controller Area Network interface
.sp

View File

@ -93,7 +93,7 @@ static int parse_ife(struct action_util *a, int *argc_p, char ***argv_p,
} else if (matches(*argv, "prio") == 0) {
ife_prio = IFE_META_PRIO;
} else if (matches(*argv, "tcindex") == 0) {
ife_prio = IFE_META_TCINDEX;
ife_tcindex = IFE_META_TCINDEX;
} else {
fprintf(stderr, "Illegal meta define <%s>\n",
*argv);