summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-09-02 21:56:44 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2019-09-02 21:56:44 -0700
commit3c8c50fdda8405b0d5fa7fbb3a34c91c9025f760 (patch)
tree0194aac19d8e7f2a9c6fa1f69ee266f79db9d3b0 /include/linux
parent4910099d3ab28deb4f7c2fd88ef5eef5362e26df (diff)
parent478556932db7a2e4dd19e4da619599fd3d5a56aa (diff)
Merge "Merge android-4.4.189 (74c8219) into msm-4.4"
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/if_pppox.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index 63828a5870f1..e578f38480e5 100644
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -105,6 +105,9 @@ extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
extern void unregister_pppox_proto(int proto_num);
extern void pppox_unbind_sock(struct sock *sk);/* delete ppp-channel binding */
extern int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
+extern int pppox_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
+
+#define PPPOEIOCSFWD32 _IOW(0xB1 ,0, compat_size_t)
/* PPPoX socket states */
enum {