commits April 2017

commits@lists.open-mesh.org

1 participants
12 discussions

[linux-merge]linux integration; annotated tag, v4.11-rc8, created. v4.11-rc8
by postmaster＠open-mesh.org 24 Apr '17

24 Apr '17

The annotated tag, v4.11-rc8 has been created at 903bda2c64f7ad1b51b05670998f4393a73f8492 (tag) tagging 5a7ad1146caa895ad718a534399e38bd2ba721b7 (commit) replaces v4.11-rc7 tagged by Linus Torvalds on Sun Apr 23 16:53:19 2017 -0700 - Shortlog ------------------------------------------------------------ Linux 4.11-rc8 -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJY/T5vAAoJEHm+PkMAQRiG6GwIAIoVXE43nzgz3WB+EPcHE7kV nDxSqU9U7SVCwXYKI13kOBhbLoROoxTA85zQidlFjpmeDgWAqsZXzQMXUebt2o1k HrsdSnpYBH6a0Of0MeuuqNjc1JLIAut5+IfcWBZfzp2s/d7WFH83nl5pfMYK+7Zi +ZL9wcnQKXa031vuheL31kvMUAeAOUliDMl/IwZ5PKIc2C2+h4e1hR8tN1wZpfyz qEcgIG+nn9PhEUc+iJkxMEbOXJTGjlXHCUPoZ1a9dJ1ozdEXxqyORpaziEWj5KYL M5rkpO707uwwyWjvSa7+GeW2zq0wcQV74qmBElNS0+HyBfossFJW0ucU4qeWfCw= =1KM+ -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.11-rc7, created. v4.11-rc7
by postmaster＠open-mesh.org 16 Apr '17

16 Apr '17

The annotated tag, v4.11-rc7 has been created at e797c36f320f82da365be7282a89e3e52b1e1ff4 (tag) tagging 4f7d029b9bf009fbee76bb10c0c4351a1870d2f3 (commit) replaces v4.11-rc6 tagged by Linus Torvalds on Sun Apr 16 13:00:28 2017 -0700 - Shortlog ------------------------------------------------------------ Linux 4.11-rc7 -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJY881cAAoJEHm+PkMAQRiGG4UH+wa2z6Qet36Uc4nXFZuSMYrO ErUWs1QpTDDv4a+LE4fgyMvM3j9XqtpfQLy1n70jfD14IqPBhHe4gytasAf+8lg1 YvddFx0Yl3sygVu3dDBNigWeVDbfwepW59coN0vI5nrMo+wrei8aVIWcFKOxdMuO n72u9vuhrkEnLJuQk7SF+t4OQob9McXE3s7QgyRopmlKhKo7mh8On7K2BRI5uluL t0j5kZM0a43EUT5rq9xR8f5pgtyfTMG/FO2MuzZn43MJcZcyfmnOP/cTSIvAKA5U 1i12lxlokYhURNUe+S6jm8A47TrqSRSJxaQJZRlfGJksZ0LJa8eUaLDCviBQEoE= =6QWZ -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.11-rc6, created. v4.11-rc6
by postmaster＠open-mesh.org 09 Apr '17

09 Apr '17

The annotated tag, v4.11-rc6 has been created at 346dd7d0b1b42d184cd20ff83384b24a6c9826d8 (tag) tagging 39da7c509acff13fc8cb12ec1bb20337c988ed36 (commit) replaces v4.11-rc5 tagged by Linus Torvalds on Sun Apr 9 09:49:57 2017 -0700 - Shortlog ------------------------------------------------------------ Linux 4.11-rc6 -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJY6mY1AAoJEHm+PkMAQRiGB14IAImsH28JPjxJVDasMIRPBxVc euPPlZgoBieu7sNt+kEsEqdkXuu0MLk6gln0IGxWLeoB2S+u3Tz5LMa2YArVqV9Z tWzOnI9auE73P2Pz/tUMOdyMs5tO0PolQxX3uljbULBozOHjHRh13fsXchX2yQvl mFeFCDqpPV0KhWRH/ciA8uIHdvYPhMpkKgRtmR8jXL0yzqLp6+2J+Bs8nHG4NNng HMVxZPC8jOE/TgWq6k/GmXgxh3H/AideFdHFbLKYnIFJW41ZGOI8a262zq3NmjPd lywpVU7O7RMhSITY5PnuR3LpNV8ftw1hz2y6t35unyFK1P02adOSj5GJ3hGdhaQ= =Xz5O -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-next-for-davem-20170406, deleted. v4.11-rc2-19-gab044f8
by postmaster＠open-mesh.org 07 Apr '17

07 Apr '17

The annotated tag, batadv-next-for-davem-20170406 has been deleted was 664922cd2fb7120631cfe0376f5b38fdfe814a94 ----------------------------------------------------------------------- tag batadv-next-for-davem-20170406 This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - Code and Style cleanups, by Sven Eckelmann (5 patches) - Remove an unneccessary memset, by Tobias Klauser - DAT and BLA optimizations for various corner cases, by Andreas Pape (5 patches) - forward/rebroadcast packet restructuring, by Linus Luessing (2 patches) - ethtool cleanup and remove unncessary code, by Sven Eckelmann (4 patches) - use net_device_stats from net_device instead of private copy, by Tobias Klauser -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAljmSyUWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeodYrD/4xzy0IGyF7vb/q3Nj0EeioldL8 /8j9G14RfnlQaTIGxHEYz6oo1A6+cuH+t/4N+ilPFv6F0bBXG3GsWYrBCYLhVKwu 2BQcoXC4ysdVqdrc7UDG5JY/t+n7JwhIcBw6kta9mt5fFVmPI/KHpefeaiUkdJb4 23YkYsOSPVcD/Yv6+uiyfOG8FFxDrqFyn1uHpE1K5/05jLhJJ8S7nODNsitMOv2m EMLNJwTstSK/boPoxIpSCraxZGgpb0rt0K6HiBiNq0GyGRCtz0pxBpDOikVwTB62 hy2aW3R59baGHPxA47oOAF60cJUlTj4pYxmsGwd9hzeJkw4eMvcYJzW6/2PXB3bj e4xBT5T+Y3bZDFdK+jW4hOCHLGC6gpwWSs5P6YDhCalhJ/meV75ef03ruIvGhVh9 qOhuSMAnqCsoJ8FMpLT3GMkSGSkOXEhL8iF/r3/PR/q0cPCquQnMjQg+Kqp7+eb6 iNHwSA0dqUiBB7KplS8KTcAxre8KlmNmGr544KY9eK0BZZ9BOleT2a2W7+QSTCKx o8fl44HmwhgxQ+mYJwG1kEfgmTRhvrOmr6KP9qTkn5lAoIGXspwBo/bA5+cyLJOU ewsx8JG5gfT2yUFB1HqdZon+rkW6KKopdHL+BL3BvQRYTUojxmr0lJBrMWg7GNYv 2lwrasmHxhWbF2L4xg== =r99K -----END PGP SIGNATURE----- ab044f8e3eaf84c4cc95d7606fadfdfa006dc8ec batman-adv: Use net_device_stats from struct net_device ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-next-for-davem-20170406, updated. batadv-next-for-davem-20170406
by postmaster＠open-mesh.org 06 Apr '17

06 Apr '17

The annotated tag, batadv-next-for-davem-20170406 has been updated to 664922cd2fb7120631cfe0376f5b38fdfe814a94 (tag) from 0f7feb3a2c47cfde19d7a4be1ffbfb16535fedf9 (which is now obsolete) tagging ab044f8e3eaf84c4cc95d7606fadfdfa006dc8ec (commit) replaces v4.11-rc2 tagged by Simon Wunderlich on Thu Apr 6 16:05:25 2017 +0200 - Shortlog ------------------------------------------------------------ This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - Code and Style cleanups, by Sven Eckelmann (5 patches) - Remove an unneccessary memset, by Tobias Klauser - DAT and BLA optimizations for various corner cases, by Andreas Pape (5 patches) - forward/rebroadcast packet restructuring, by Linus Luessing (2 patches) - ethtool cleanup and remove unncessary code, by Sven Eckelmann (4 patches) - use net_device_stats from net_device instead of private copy, by Tobias Klauser -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAljmSyUWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeodYrD/4xzy0IGyF7vb/q3Nj0EeioldL8 /8j9G14RfnlQaTIGxHEYz6oo1A6+cuH+t/4N+ilPFv6F0bBXG3GsWYrBCYLhVKwu 2BQcoXC4ysdVqdrc7UDG5JY/t+n7JwhIcBw6kta9mt5fFVmPI/KHpefeaiUkdJb4 23YkYsOSPVcD/Yv6+uiyfOG8FFxDrqFyn1uHpE1K5/05jLhJJ8S7nODNsitMOv2m EMLNJwTstSK/boPoxIpSCraxZGgpb0rt0K6HiBiNq0GyGRCtz0pxBpDOikVwTB62 hy2aW3R59baGHPxA47oOAF60cJUlTj4pYxmsGwd9hzeJkw4eMvcYJzW6/2PXB3bj e4xBT5T+Y3bZDFdK+jW4hOCHLGC6gpwWSs5P6YDhCalhJ/meV75ef03ruIvGhVh9 qOhuSMAnqCsoJ8FMpLT3GMkSGSkOXEhL8iF/r3/PR/q0cPCquQnMjQg+Kqp7+eb6 iNHwSA0dqUiBB7KplS8KTcAxre8KlmNmGr544KY9eK0BZZ9BOleT2a2W7+QSTCKx o8fl44HmwhgxQ+mYJwG1kEfgmTRhvrOmr6KP9qTkn5lAoIGXspwBo/bA5+cyLJOU ewsx8JG5gfT2yUFB1HqdZon+rkW6KKopdHL+BL3BvQRYTUojxmr0lJBrMWg7GNYv 2lwrasmHxhWbF2L4xg== =r99K -----END PGP SIGNATURE----- Andreas Pape (5): batman-adv: prevent multiple ARP replies sent by gateways if dat enabled batman-adv: prevent duplication of ARP replies when DAT is used batman-adv: drop unicast packets from other backbone gw batman-adv: changed debug messages for easier bla debugging batman-adv: handle race condition for claims between gateways Linus Lüssing (2): batman-adv: privatize forw_packet skb assignment batman-adv: restructure rebroadcast counter into forw_packet API Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (9): batman-adv: Reduce preprocessor checks in multicast.c batman-adv: Fix unbalanced braces around else statement batman-adv: Fix possible side-effects in _batadv_dbg batman-adv: Convert BATADV_PRINT_VID macro to function batman-adv: Use __func__ to add function names to messages batman-adv: Use ethtool helper to get link status batman-adv: Remove ethtool msglevel functions batman-adv: Remove ethtool .get_settings stub batman-adv: Group ethtool related code together Tobias Klauser (2): batman-adv: Omit unnecessary memset of netdev private data batman-adv: Use net_device_stats from struct net_device ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-next-for-davem-20170406, created. batadv-next-for-davem-20170406
by postmaster＠open-mesh.org 06 Apr '17

06 Apr '17

The annotated tag, batadv-next-for-davem-20170406 has been created at 0f7feb3a2c47cfde19d7a4be1ffbfb16535fedf9 (tag) tagging ab044f8e3eaf84c4cc95d7606fadfdfa006dc8ec (commit) replaces v4.11-rc2 tagged by Simon Wunderlich on Thu Apr 6 16:02:56 2017 +0200 - Shortlog ------------------------------------------------------------ This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - Code and Style cleanups, by Sven Eckelmann (5 patches) - Remove an unneccessary memset, by Tobias Klauser - DAT and BLA optimizations for various corner cases, by Andreas Pape (4 patches) - forward/rebroadcast packet restructuring, by Linus Luessing (2 patches) - ethtool cleanup and remove unncessary code, by Sven Eckelmann (4 patches) - use net_device_stats from net_device instead of private copy, by Tobias Klauser -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAljmSpAWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoSebEACYcXYnGvG5+LRGZYQIXoAO+M3t dYQnfFtdEHyWEI6zO8Vg1BqQabz51oJRSn8/Ejj3QFs3VRuyPSU74E3hnZgdKd9r i4iWxzIN9j/77lJ/ZPuSw75qG+xmY62bFg80OK5NY5Mxka/OmZqLyoFwgKIrWrn2 wI1a60U//ExhyaTPFCzTe1DddfSmf6b91OaIcafqgI0wTr8AdvVIj2iw+pDLw917 Ar0yse3BAhLDGdK2QXbQuQC9ouOMe3/1PpXupLTf1GlecT5NmsyIE5Y7brsLgtVT f0+g+yvBRHHyACI/Owqq9hFchi5H47tE6eZYJ881nXXpjnMXhiHk+MscrnvmjJUV gVRXGsa7uTDi370S6zhVs3nsCoRnEwGL05O7Xu46e/JO1SqSbOC5LZ6NOqzNO7FN 1FWaY7btwdOzx71Y7w7HJAknWkwYxCu0TlHvxzO+/FOWbryZH1juiB4qPnO1c/Tx 4MV4KezvMuklodeOOpoV3NaVJkA7wYoKEHZJL/GaLG8Fc63+C6wwLzL5dMG93dVG sGlOr22u/bxhvjvRMRENvjn505NVyqU5mz7imkpFYIHWYrsr35Nb9moUjlrR9l16 fPQDXp3Ar9WHG9Pjj2UIjpmpHCmB86Q0XrEaSgHqOTcSn9EWe8S6ebgdJWrYcOxQ ++P7NeZC9sAlgi8xzw== =mw7l -----END PGP SIGNATURE----- Andreas Pape (5): batman-adv: prevent multiple ARP replies sent by gateways if dat enabled batman-adv: prevent duplication of ARP replies when DAT is used batman-adv: drop unicast packets from other backbone gw batman-adv: changed debug messages for easier bla debugging batman-adv: handle race condition for claims between gateways Linus Lüssing (2): batman-adv: privatize forw_packet skb assignment batman-adv: restructure rebroadcast counter into forw_packet API Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (9): batman-adv: Reduce preprocessor checks in multicast.c batman-adv: Fix unbalanced braces around else statement batman-adv: Fix possible side-effects in _batadv_dbg batman-adv: Convert BATADV_PRINT_VID macro to function batman-adv: Use __func__ to add function names to messages batman-adv: Use ethtool helper to get link status batman-adv: Remove ethtool msglevel functions batman-adv: Remove ethtool .get_settings stub batman-adv: Group ethtool related code together Tobias Klauser (2): batman-adv: Omit unnecessary memset of netdev private data batman-adv: Use net_device_stats from struct net_device ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] ecsv/pu, master: batman-adv: Use net_device_stats from struct net_device (c2b207d)
by postmaster＠open-mesh.org 05 Apr '17

05 Apr '17

Repository : ssh://git@open-mesh.org/batman-adv On branches: ecsv/pu,master >--------------------------------------------------------------- commit c2b207dd27524d9d332b42c62e6735f86a66b586 Author: Tobias Klauser <tklauser(a)distanz.ch> Date: Wed Apr 5 13:46:31 2017 +0200 batman-adv: Use net_device_stats from struct net_device Instead of using a private copy of struct net_device_stats in struct batadv_priv, use stats from struct net_device. Signed-off-by: Tobias Klauser <tklauser(a)distanz.ch> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- c2b207dd27524d9d332b42c62e6735f86a66b586 net/batman-adv/distributed-arp-table.c | 9 +++++---- net/batman-adv/soft-interface.c | 2 +- net/batman-adv/types.h | 2 -- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 0608fcf..013e970 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -1003,6 +1003,7 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, bool ret = false; struct batadv_dat_entry *dat_entry = NULL; struct sk_buff *skb_new; + struct net_device *soft_iface = bat_priv->soft_iface; int hdr_size = 0; unsigned short vid; @@ -1061,10 +1062,10 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, if (!skb_new) goto out; - skb_new->protocol = eth_type_trans(skb_new, - bat_priv->soft_iface); - bat_priv->stats.rx_packets++; - bat_priv->stats.rx_bytes += skb->len + ETH_HLEN + hdr_size; + skb_new->protocol = eth_type_trans(skb_new, soft_iface); + + soft_iface->stats.rx_packets++; + soft_iface->stats.rx_bytes += skb->len + ETH_HLEN + hdr_size; netif_rx(skb_new); batadv_dbg(BATADV_DBG_DAT, bat_priv, "ARP request replied locally\n"); diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 7f6a4d3..b25789a 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -118,7 +118,7 @@ static u64 batadv_sum_counter(struct batadv_priv *bat_priv, size_t idx) static struct net_device_stats *batadv_interface_stats(struct net_device *dev) { struct batadv_priv *bat_priv = netdev_priv(dev); - struct net_device_stats *stats = &bat_priv->stats; + struct net_device_stats *stats = &dev->stats; stats->tx_packets = batadv_sum_counter(bat_priv, BATADV_CNT_TX); stats->tx_bytes = batadv_sum_counter(bat_priv, BATADV_CNT_TX_BYTES); diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index b2a5871..ea43a64 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1000,7 +1000,6 @@ struct batadv_priv_bat_v { * struct batadv_priv - per mesh interface data * @mesh_state: current status of the mesh (inactive/active/deactivating) * @soft_iface: net device which holds this struct as private data - * @stats: structure holding the data for the ndo_get_stats() call * @bat_counters: mesh internal traffic statistic counters (see batadv_counters) * @aggregated_ogms: bool indicating whether OGM aggregation is enabled * @bonding: bool indicating whether traffic bonding is enabled @@ -1055,7 +1054,6 @@ struct batadv_priv_bat_v { struct batadv_priv { atomic_t mesh_state; struct net_device *soft_iface; - struct net_device_stats stats; u64 __percpu *bat_counters; /* Per cpu counters */ atomic_t aggregated_ogms; atomic_t bonding;

1 0

[linux-merge]linux integration; annotated tag, v4.11-rc5, created. v4.11-rc5
by postmaster＠open-mesh.org 03 Apr '17

03 Apr '17

The annotated tag, v4.11-rc5 has been created at a54e39dbdd34e6d6b0f971a16233efa320357d5c (tag) tagging a71c9a1c779f2499fb2afc0553e543f18aff6edf (commit) replaces v4.11-rc4 tagged by Linus Torvalds on Sun Apr 2 17:24:04 2017 -0700 - Shortlog ------------------------------------------------------------ Linux 4.11-rc5 -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJY4ZYkAAoJEHm+PkMAQRiGsq4H/R4PMXDoe2XhSSk7IoT97pXV /A8np/scAPjzEgYUidbb54OSqWwsPRuPGWONTFeSrE2u0L4wln/REI91jg7QetLq IisncExlYeJ/XQ+iO0ZZh9fLbqwIlEJFdSXmyIFr3m/TBxe8a61C8j93oNgM1tHT yuwzlq7c3sLq2hsmUG2HyL2kJsEfRasv4Rk0yhFuti12zVsBoTW4qmZuMauq+gdf f7cSYgiHhPTdb2o+azg5O7uYNHaQQBxdUMlIuhhYtVOUq+pFDO23SLHSFIW2NwOm Zn5R6CFSrLsCw0Bx0v8Xlc151QUbaRK4h9lhUhkBr6d3uNShU1NQ9JojpSvYwBo= =vP6E -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: Remove ethtool .get_settings stub (cb01f95)
by postmaster＠open-mesh.org 03 Apr '17

03 Apr '17

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit cb01f95e5dc89199187d55a349f4fd5dbf27e362 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Apr 1 14:47:05 2017 +0200 batman-adv: Remove ethtool .get_settings stub The .get_settings function pointer and the related API was deprecated. Fortunately, batman-adv is a virtual interface and never provided any useful information via .get_settings. The stub can therefore be removed. This also avoids that incorrect information is shown in ethtool about the batadv interface. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- cb01f95e5dc89199187d55a349f4fd5dbf27e362 net/batman-adv/soft-interface.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 4e888c5..c2a0034 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -64,7 +64,6 @@ #include "sysfs.h" #include "translation-table.h" -static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd); static void batadv_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info); static void batadv_get_strings(struct net_device *dev, u32 stringset, u8 *data); @@ -73,7 +72,6 @@ static void batadv_get_ethtool_stats(struct net_device *dev, static int batadv_get_sset_count(struct net_device *dev, int stringset); static const struct ethtool_ops batadv_ethtool_ops = { - .get_settings = batadv_get_settings, .get_drvinfo = batadv_get_drvinfo, .get_link = ethtool_op_get_link, .get_strings = batadv_get_strings, @@ -1078,23 +1076,6 @@ struct rtnl_link_ops batadv_link_ops __read_mostly = { .dellink = batadv_softif_destroy_netlink, }; -/* ethtool */ -static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) -{ - cmd->supported = 0; - cmd->advertising = 0; - ethtool_cmd_speed_set(cmd, SPEED_10); - cmd->duplex = DUPLEX_FULL; - cmd->port = PORT_TP; - cmd->phy_address = 0; - cmd->transceiver = XCVR_INTERNAL; - cmd->autoneg = AUTONEG_DISABLE; - cmd->maxtxpkt = 0; - cmd->maxrxpkt = 0; - - return 0; -} - static void batadv_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) {

1 0

[batman-adv] master: batman-adv: Group ethtool related code together (080d75e)
by postmaster＠open-mesh.org 03 Apr '17

03 Apr '17

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 080d75e54df00bd784aa18196f549c7457696487 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Apr 1 14:47:06 2017 +0200 batman-adv: Group ethtool related code together The ethtool code was spread in soft-interface.c. This makes reading the code and working on it unnecessary complicated. Having everything in a common place next to the other code which references it, makes it slightly easier. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 080d75e54df00bd784aa18196f549c7457696487 net/batman-adv/soft-interface.c | 191 +++++++++++++++++++--------------------- 1 file changed, 92 insertions(+), 99 deletions(-) diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index c2a0034..7f6a4d3 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -64,21 +64,6 @@ #include "sysfs.h" #include "translation-table.h" -static void batadv_get_drvinfo(struct net_device *dev, - struct ethtool_drvinfo *info); -static void batadv_get_strings(struct net_device *dev, u32 stringset, u8 *data); -static void batadv_get_ethtool_stats(struct net_device *dev, - struct ethtool_stats *stats, u64 *data); -static int batadv_get_sset_count(struct net_device *dev, int stringset); - -static const struct ethtool_ops batadv_ethtool_ops = { - .get_drvinfo = batadv_get_drvinfo, - .get_link = ethtool_op_get_link, - .get_strings = batadv_get_strings, - .get_ethtool_stats = batadv_get_ethtool_stats, - .get_sset_count = batadv_get_sset_count, -}; - int batadv_skb_head_push(struct sk_buff *skb, unsigned int len) { int result; @@ -943,6 +928,98 @@ static const struct net_device_ops batadv_netdev_ops = { .ndo_del_slave = batadv_softif_slave_del, }; +static void batadv_get_drvinfo(struct net_device *dev, + struct ethtool_drvinfo *info) +{ + strlcpy(info->driver, "B.A.T.M.A.N. advanced", sizeof(info->driver)); + strlcpy(info->version, BATADV_SOURCE_VERSION, sizeof(info->version)); + strlcpy(info->fw_version, "N/A", sizeof(info->fw_version)); + strlcpy(info->bus_info, "batman", sizeof(info->bus_info)); +} + +/* Inspired by drivers/net/ethernet/dlink/sundance.c:1702 + * Declare each description string in struct.name[] to get fixed sized buffer + * and compile time checking for strings longer than ETH_GSTRING_LEN. + */ +static const struct { + const char name[ETH_GSTRING_LEN]; +} batadv_counters_strings[] = { + { "tx" }, + { "tx_bytes" }, + { "tx_dropped" }, + { "rx" }, + { "rx_bytes" }, + { "forward" }, + { "forward_bytes" }, + { "mgmt_tx" }, + { "mgmt_tx_bytes" }, + { "mgmt_rx" }, + { "mgmt_rx_bytes" }, + { "frag_tx" }, + { "frag_tx_bytes" }, + { "frag_rx" }, + { "frag_rx_bytes" }, + { "frag_fwd" }, + { "frag_fwd_bytes" }, + { "tt_request_tx" }, + { "tt_request_rx" }, + { "tt_response_tx" }, + { "tt_response_rx" }, + { "tt_roam_adv_tx" }, + { "tt_roam_adv_rx" }, +#ifdef CONFIG_BATMAN_ADV_DAT + { "dat_get_tx" }, + { "dat_get_rx" }, + { "dat_put_tx" }, + { "dat_put_rx" }, + { "dat_cached_reply_tx" }, +#endif +#ifdef CONFIG_BATMAN_ADV_NC + { "nc_code" }, + { "nc_code_bytes" }, + { "nc_recode" }, + { "nc_recode_bytes" }, + { "nc_buffer" }, + { "nc_decode" }, + { "nc_decode_bytes" }, + { "nc_decode_failed" }, + { "nc_sniffed" }, +#endif +}; + +static void batadv_get_strings(struct net_device *dev, u32 stringset, u8 *data) +{ + if (stringset == ETH_SS_STATS) + memcpy(data, batadv_counters_strings, + sizeof(batadv_counters_strings)); +} + +static void batadv_get_ethtool_stats(struct net_device *dev, + struct ethtool_stats *stats, u64 *data) +{ + struct batadv_priv *bat_priv = netdev_priv(dev); + int i; + + for (i = 0; i < BATADV_CNT_NUM; i++) + data[i] = batadv_sum_counter(bat_priv, i); +} + +static int batadv_get_sset_count(struct net_device *dev, int stringset) +{ + if (stringset == ETH_SS_STATS) + return BATADV_CNT_NUM; + + return -EOPNOTSUPP; +} + +static const struct ethtool_ops batadv_ethtool_ops = { + .get_drvinfo = batadv_get_drvinfo, + .get_link = ethtool_op_get_link, + .get_strings = batadv_get_strings, + .get_ethtool_stats = batadv_get_ethtool_stats, + .get_sset_count = batadv_get_sset_count, +}; + /** * batadv_softif_free - Deconstructor of batadv_soft_interface * @dev: Device to cleanup and remove @@ -1075,87 +1152,3 @@ struct rtnl_link_ops batadv_link_ops __read_mostly = { .setup = batadv_softif_init_early, .dellink = batadv_softif_destroy_netlink, }; - -static void batadv_get_drvinfo(struct net_device *dev, - struct ethtool_drvinfo *info) -{ - strlcpy(info->driver, "B.A.T.M.A.N. advanced", sizeof(info->driver)); - strlcpy(info->version, BATADV_SOURCE_VERSION, sizeof(info->version)); - strlcpy(info->fw_version, "N/A", sizeof(info->fw_version)); - strlcpy(info->bus_info, "batman", sizeof(info->bus_info)); -} - -/* Inspired by drivers/net/ethernet/dlink/sundance.c:1702 - * Declare each description string in struct.name[] to get fixed sized buffer - * and compile time checking for strings longer than ETH_GSTRING_LEN. - */ -static const struct { - const char name[ETH_GSTRING_LEN]; -} batadv_counters_strings[] = { - { "tx" }, - { "tx_bytes" }, - { "tx_dropped" }, - { "rx" }, - { "rx_bytes" }, - { "forward" }, - { "forward_bytes" }, - { "mgmt_tx" }, - { "mgmt_tx_bytes" }, - { "mgmt_rx" }, - { "mgmt_rx_bytes" }, - { "frag_tx" }, - { "frag_tx_bytes" }, - { "frag_rx" }, - { "frag_rx_bytes" }, - { "frag_fwd" }, - { "frag_fwd_bytes" }, - { "tt_request_tx" }, - { "tt_request_rx" }, - { "tt_response_tx" }, - { "tt_response_rx" }, - { "tt_roam_adv_tx" }, - { "tt_roam_adv_rx" }, -#ifdef CONFIG_BATMAN_ADV_DAT - { "dat_get_tx" }, - { "dat_get_rx" }, - { "dat_put_tx" }, - { "dat_put_rx" }, - { "dat_cached_reply_tx" }, -#endif -#ifdef CONFIG_BATMAN_ADV_NC - { "nc_code" }, - { "nc_code_bytes" }, - { "nc_recode" }, - { "nc_recode_bytes" }, - { "nc_buffer" }, - { "nc_decode" }, - { "nc_decode_bytes" }, - { "nc_decode_failed" }, - { "nc_sniffed" }, -#endif -}; - -static void batadv_get_strings(struct net_device *dev, u32 stringset, u8 *data) -{ - if (stringset == ETH_SS_STATS) - memcpy(data, batadv_counters_strings, - sizeof(batadv_counters_strings)); -} - -static void batadv_get_ethtool_stats(struct net_device *dev, - struct ethtool_stats *stats, u64 *data) -{ - struct batadv_priv *bat_priv = netdev_priv(dev); - int i; - - for (i = 0; i < BATADV_CNT_NUM; i++) - data[i] = batadv_sum_counter(bat_priv, i); -} - -static int batadv_get_sset_count(struct net_device *dev, int stringset) -{ - if (stringset == ETH_SS_STATS) - return BATADV_CNT_NUM; - - return -EOPNOTSUPP; -}

1 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits April 2017