diff options
| author | Dave Airlie | 2019-02-18 04:27:15 +0100 |
|---|---|---|
| committer | Dave Airlie | 2019-02-18 04:27:15 +0100 |
| commit | c06de56121e3ac0f0f1f4a081c041654ffcacd62 (patch) | |
| tree | 3662e7052352b0f1b78e8832b1d3b91ca211b798 /drivers/net/ppp | |
| parent | Merge tag 'drm-misc-next-2019-02-11' of git://anongit.freedesktop.org/drm/drm... (diff) | |
| parent | Linux 5.0-rc7 (diff) | |
| download | kernel-qcow2-linux-c06de56121e3ac0f0f1f4a081c041654ffcacd62.tar.gz kernel-qcow2-linux-c06de56121e3ac0f0f1f4a081c041654ffcacd62.tar.xz kernel-qcow2-linux-c06de56121e3ac0f0f1f4a081c041654ffcacd62.zip | |
Merge v5.0-rc7 into drm-next
Backmerging for nouveau and imx that needed some fixes for next pulls.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/net/ppp')
| -rw-r--r-- | drivers/net/ppp/pppoe.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c index 62dc564b251d..f22639f0116a 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c @@ -445,6 +445,7 @@ static int pppoe_rcv(struct sk_buff *skb, struct net_device *dev, if (pskb_trim_rcsum(skb, len)) goto drop; + ph = pppoe_hdr(skb); pn = pppoe_pernet(dev_net(dev)); /* Note that get_item does a sock_hold(), so sk_pppox(po) |