Commit 5de8f7b1 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Remove entry .tx_fill_descr.. from struct rtl819x_ops 



Remove entry .tx_fill_descriptor and replace it with function name
rtl92e_fill_tx_desc. This increases readability of the code.

Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/1ae7d44ef74dc6cb61ff43f670b21d702403d7fb.1676840647.git.philipp.g.hortmann@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e42c99ea

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+2 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ static char *ifname = "wlan%d"; 
static const struct rtl819x_ops rtl819xp_ops = {

	.nic_type			= NIC_8192E,

	.link_change			= rtl92e_link_change,

	.tx_fill_descriptor		= rtl92e_fill_tx_desc,

	.tx_fill_cmd_descriptor		= rtl92e_fill_tx_cmd_desc,

	.rx_query_status_descriptor	= rtl92e_get_rx_stats,

	.rx_command_packet_handler = NULL,
@@ -496,7 +495,7 @@ static void _rtl92e_prepare_beacon(struct tasklet_struct *t) 
	skb_push(pnewskb, priv->rtllib->tx_headroom);



	pdesc = &ring->desc[0];

	priv->ops->tx_fill_descriptor(dev, pdesc, tcb_desc, pnewskb);

	rtl92e_fill_tx_desc(dev, pdesc, tcb_desc, pnewskb);

	__skb_queue_tail(&ring->queue, pnewskb);

	pdesc->OWN = 1;

}
@@ -1637,7 +1636,7 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb) 
		if (priv->rtllib->LedControlHandler)

			priv->rtllib->LedControlHandler(dev, LED_CTL_TX);

	}

	priv->ops->tx_fill_descriptor(dev, pdesc, tcb_desc, skb);

	rtl92e_fill_tx_desc(dev, pdesc, tcb_desc, skb);

	__skb_queue_tail(&ring->queue, skb);

	pdesc->OWN = 1;

	spin_unlock_irqrestore(&priv->irq_th_lock, flags);

drivers/staging/rtl8192e/rtl8192e/rtl_core.h

+0 −4
Original line number Diff line number Diff line
@@ -207,10 +207,6 @@ struct rtl819x_ops { 
	enum nic_t nic_type;

	void (*init_before_adapter_start)(struct net_device *dev);

	void (*link_change)(struct net_device *dev);

	void (*tx_fill_descriptor)(struct net_device *dev,

				   struct tx_desc *tx_desc,

				   struct cb_desc *cb_desc,

				   struct sk_buff *skb);

	void (*tx_fill_cmd_descriptor)(struct net_device *dev,

				       struct tx_desc_cmd *entry,

				       struct cb_desc *cb_desc,