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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
if_pppox.h
diff --git
a/include/linux/if_pppox.h
b/include/linux/if_pppox.h
index 66a7d7600f4343a809252ba809d92bca5bc7e8f9..b49cf923becc2405b3d99ef6f88e5a524423e7a3 100644
(file)
--- a/
include/linux/if_pppox.h
+++ b/
include/linux/if_pppox.h
@@
-74,7
+74,7
@@
static inline struct sock *sk_pppox(struct pppox_sock *po)
struct module;
struct pppox_proto {
- int (*create)(struct net *net, struct socket *sock);
+ int (*create)(struct net *net, struct socket *sock
, int kern
);
int (*ioctl)(struct socket *sock, unsigned int cmd,
unsigned long arg);
struct module *owner;