mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two cases of overlapping changes, nothing fancy. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
af144a9834
129 changed files with 1265 additions and 899 deletions
|
|
@ -196,7 +196,7 @@ int main(int argc, char **argv)
|
|||
}
|
||||
|
||||
memset(&info, 0, sizeof(info));
|
||||
ret = bpf_obj_get_info_by_fd(prog_fd, &info, &info_len);
|
||||
ret = bpf_obj_get_info_by_fd(dummy_prog_fd, &info, &info_len);
|
||||
if (ret) {
|
||||
printf("can't get prog info - %s\n", strerror(errno));
|
||||
return ret;
|
||||
|
|
|
|||
Loading…
Reference in a new issue