diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-20 10:08:17 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-20 10:08:17 -0700 |
| commit | c57d5621d2f2dc238f4b9c4d00b2a54187a75445 (patch) | |
| tree | ece13738a44545fb110e5d73adbf2625bc7a1ea6 /drivers/net/ppp/pppox.c | |
| parent | 6ccfe64c770139675a080ee5029ded7d89d9ea0d (diff) | |
| parent | 52721d9d3334c1cb1f76219a161084094ec634dc (diff) | |
| download | blackbird-op-linux-c57d5621d2f2dc238f4b9c4d00b2a54187a75445.tar.gz blackbird-op-linux-c57d5621d2f2dc238f4b9c4d00b2a54187a75445.zip | |
Merge tag 'v4.2-rc3' into next
Sync up with Linux 4.2-rc3 to bring in infrastructure (OF) pieces.
Diffstat (limited to 'drivers/net/ppp/pppox.c')
| -rw-r--r-- | drivers/net/ppp/pppox.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ppp/pppox.c b/drivers/net/ppp/pppox.c index 2940e9fe351b..0e1b30622477 100644 --- a/drivers/net/ppp/pppox.c +++ b/drivers/net/ppp/pppox.c @@ -118,7 +118,7 @@ static int pppox_create(struct net *net, struct socket *sock, int protocol, !try_module_get(pppox_protos[protocol]->owner)) goto out; - rc = pppox_protos[protocol]->create(net, sock); + rc = pppox_protos[protocol]->create(net, sock, kern); module_put(pppox_protos[protocol]->owner); out: |
