Merge branch 'master' into for-next

Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index 48e9cc0369b1..1f73d7f7e024 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -2532,6 +2532,9 @@ static void _isdn_setup(struct net_device *dev)
 
         /* Setup the generic properties */
         dev->flags = IFF_NOARP|IFF_POINTOPOINT;
+
+        /* isdn prepends a header in the tx path, can't share skbs */
+        dev->priv_flags &= ~IFF_TX_SKB_SHARING;
         dev->header_ops = NULL;
         dev->netdev_ops = &isdn_netdev_ops;