Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

[linux-2.6-microblaze.git] / net / l2tp / l2tp_eth.c

diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
index fd5ac27..7ed2b4e 100644 (file)
--- a/net/l2tp/l2tp_eth.c
+++ b/net/l2tp/l2tp_eth.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * L2TPv3 ethernet pseudowire driver
+/* L2TPv3 ethernet pseudowire driver
  *
  * Copyright (c) 2008,2009,2010 Katalix Systems Ltd
  */
@@ -51,7 +50,6 @@ struct l2tp_eth_sess {
        struct net_device __rcu *dev;
 };
 
-
 static int l2tp_eth_dev_init(struct net_device *dev)
 {
        eth_hw_addr_random(dev);
@@ -73,7 +71,7 @@ static void l2tp_eth_dev_uninit(struct net_device *dev)
         */
 }
 
-static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        struct l2tp_eth *priv = netdev_priv(dev);
        struct l2tp_session *session = priv->session;
@@ -94,13 +92,12 @@ static void l2tp_eth_get_stats64(struct net_device *dev,
 {
        struct l2tp_eth *priv = netdev_priv(dev);
 
-       stats->tx_bytes   = (unsigned long) atomic_long_read(&priv->tx_bytes);
-       stats->tx_packets = (unsigned long) atomic_long_read(&priv->tx_packets);
-       stats->tx_dropped = (unsigned long) atomic_long_read(&priv->tx_dropped);
-       stats->rx_bytes   = (unsigned long) atomic_long_read(&priv->rx_bytes);
-       stats->rx_packets = (unsigned long) atomic_long_read(&priv->rx_packets);
-       stats->rx_errors  = (unsigned long) atomic_long_read(&priv->rx_errors);
-
+       stats->tx_bytes   = (unsigned long)atomic_long_read(&priv->tx_bytes);
+       stats->tx_packets = (unsigned long)atomic_long_read(&priv->tx_packets);
+       stats->tx_dropped = (unsigned long)atomic_long_read(&priv->tx_dropped);
+       stats->rx_bytes   = (unsigned long)atomic_long_read(&priv->rx_bytes);
+       stats->rx_packets = (unsigned long)atomic_long_read(&priv->rx_packets);
+       stats->rx_errors  = (unsigned long)atomic_long_read(&priv->rx_errors);
 }
 
 static const struct net_device_ops l2tp_eth_netdev_ops = {
@@ -348,13 +345,11 @@ err:
        return rc;
 }
 
-
 static const struct l2tp_nl_cmd_ops l2tp_eth_nl_cmd_ops = {
        .session_create = l2tp_eth_create,
        .session_delete = l2tp_session_delete,
 };
 
-
 static int __init l2tp_eth_init(void)
 {
        int err = 0;