shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-03 09:41:54 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'batadv-next-pullrequest-20220916' of git://git.open-mesh.org/linux-merge

Browse Source 
Simon Wunderlich says:

====================
This cleanup patchset includes the following patches:

 - bump version strings, by Simon Wunderlich

 - drop unused headers in trace.h, by Sven Eckelmann

 - drop initialization of flexible ethtool_link_ksettings,
   by Sven Eckelmann

 - remove unused struct definitions, by Marek Lindner

* tag 'batadv-next-pullrequest-20220916' of git://git.open-mesh.org/linux-merge:
  batman-adv: remove unused struct definitions
  batman-adv: Drop initialization of flexible ethtool_link_ksettings
  batman-adv: Drop unused headers in trace.h
  batman-adv: Start new development cycle
====================

Link: https://lore.kernel.org/r/20220916161454.1413154-1-sw@simonwunderlich.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2022-09-19 18:16:03 -07:00
parent 4e2309625f 76af7483b3
commit 4dccf41d79
4 changed files with 1 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net/batman-adv/bat_v_elp.c
View File

@@ -125,7 +125,6 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)
/* if not a wifi interface, check if this device provides data via
* ethtool (e.g. an Ethernet adapter)
*/
memset(&link_settings, 0, sizeof(link_settings));
rtnl_lock();
ret = __ethtool_get_link_ksettings(hard_iface->net_dev, &link_settings);
rtnl_unlock();

2
net/batman-adv/main.h
View File

@@ -13,7 +13,7 @@
#define BATADV_DRIVER_DEVICE "batman-adv"
#ifndef BATADV_SOURCE_VERSION
#define BATADV_SOURCE_VERSION "2022.2"
#define BATADV_SOURCE_VERSION "2022.3"
#endif
/* B.A.T.M.A.N. parameters */

2
net/batman-adv/trace.h
View File

@@ -9,8 +9,6 @@
#include "main.h"
#include <linux/bug.h>
#include <linux/kernel.h>
#include <linux/netdevice.h>
#include <linux/percpu.h>
#include <linux/printk.h>

39
net/batman-adv/types.h
View File

@@ -1740,45 +1740,6 @@ struct batadv_priv {
#endif
};
/**
* struct batadv_socket_client - layer2 icmp socket client data
*/
struct batadv_socket_client {
/**
* @queue_list: packet queue for packets destined for this socket client
*/
struct list_head queue_list;
/** @queue_len: number of packets in the packet queue (queue_list) */
unsigned int queue_len;
/** @index: socket client's index in the batadv_socket_client_hash */
unsigned char index;
/** @lock: lock protecting queue_list, queue_len & index */
spinlock_t lock;
/** @queue_wait: socket client's wait queue */
wait_queue_head_t queue_wait;
/** @bat_priv: pointer to soft_iface this client belongs to */
struct batadv_priv *bat_priv;
};
/**
* struct batadv_socket_packet - layer2 icmp packet for socket client
*/
struct batadv_socket_packet {
/** @list: list node for &batadv_socket_client.queue_list */
struct list_head list;
/** @icmp_len: size of the layer2 icmp packet */
size_t icmp_len;
/** @icmp_packet: layer2 icmp packet */
u8 icmp_packet[BATADV_ICMP_MAX_PACKET_SIZE];
};
#ifdef CONFIG_BATMAN_ADV_BLA
/**