projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...
[firefly-linux-kernel-4.4.55.git]
/
net
/
sched
/
em_nbyte.c
diff --git
a/net/sched/em_nbyte.c
b/net/sched/em_nbyte.c
index a3bed07a008b2f746376ce0970cd4f15196adbdb..df3110d695857e672f1a50f83399a7f63959dd00 100644
(file)
--- a/
net/sched/em_nbyte.c
+++ b/
net/sched/em_nbyte.c
@@
-23,7
+23,7
@@
struct nbyte_data {
char pattern[0];
};
-static int em_nbyte_change(struct
tcf_proto *tp
, void *data, int data_len,
+static int em_nbyte_change(struct
net *net
, void *data, int data_len,
struct tcf_ematch *em)
{
struct tcf_em_nbyte *nbyte = data;