mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Overlapping changes in selftests Makefile. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
a7b15ab887
424 changed files with 3842 additions and 2410 deletions
|
|
@ -1063,7 +1063,7 @@ static int cmd_load_pcap(char *file)
|
|||
|
||||
static int cmd_load(char *arg)
|
||||
{
|
||||
char *subcmd, *cont, *tmp = strdup(arg);
|
||||
char *subcmd, *cont = NULL, *tmp = strdup(arg);
|
||||
int ret = CMD_OK;
|
||||
|
||||
subcmd = strtok_r(tmp, " ", &cont);
|
||||
|
|
@ -1073,7 +1073,10 @@ static int cmd_load(char *arg)
|
|||
bpf_reset();
|
||||
bpf_reset_breakpoints();
|
||||
|
||||
ret = cmd_load_bpf(cont);
|
||||
if (!cont)
|
||||
ret = CMD_ERR;
|
||||
else
|
||||
ret = cmd_load_bpf(cont);
|
||||
} else if (matches(subcmd, "pcap") == 0) {
|
||||
ret = cmd_load_pcap(cont);
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Reference in a new issue