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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[firefly-linux-kernel-4.4.55.git]
/
net
/
atm
/
mpc.c
diff --git
a/net/atm/mpc.c
b/net/atm/mpc.c
index e8e0e7a8a23d12029440b2f01b1c10b6e6326f27..0e982222d4255dbbc5ec9818e65af1145e086a03 100644
(file)
--- a/
net/atm/mpc.c
+++ b/
net/atm/mpc.c
@@
-599,7
+599,7
@@
static netdev_tx_t mpc_send_packet(struct sk_buff *skb,
}
non_ip:
- return
mpc->old_ops->ndo_start_xmit(skb, dev
);
+ return
__netdev_start_xmit(mpc->old_ops, skb, dev, false
);
}
static int atm_mpoa_vcc_attach(struct atm_vcc *vcc, void __user *arg)