Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9bdce65 authored by David Woodhouse's avatar David Woodhouse Committed by David S. Miller
Browse files

libertas: move lbs_hard_start_xmit() into tx.c 



... where it can shortly be merged with lbs_process_tx()...

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6b4a7e0f

drivers/net/wireless/libertas/decl.h

+1 −1
Original line number Diff line number Diff line
@@ -50,10 +50,10 @@ void lbs_upload_rx_packet(struct lbs_private *priv, struct sk_buff *skb); 


/** The proc fs interface */

int lbs_process_rx_command(struct lbs_private *priv);

int lbs_process_tx(struct lbs_private *priv, struct sk_buff *skb);

void __lbs_cleanup_and_insert_cmd(struct lbs_private *priv,

	struct cmd_ctrl_node *ptempcmd);



int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev);

int lbs_set_regiontable(struct lbs_private *priv, u8 region, u8 band);



int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *);

drivers/net/wireless/libertas/main.c

+0 −32
Original line number Diff line number Diff line
@@ -515,38 +515,6 @@ static int lbs_close(struct net_device *dev) 
		return 0;

}





static int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)

{

	int ret = 0;

	struct lbs_private *priv = dev->priv;



	lbs_deb_enter(LBS_DEB_TX);



	/* We could return NETDEV_TX_BUSY here, but I'd actually 

	   like to get the point where we can BUG() */

	if (priv->dnld_sent) {

		lbs_pr_err("%s while dnld_sent\n", __func__);

		priv->stats.tx_dropped++;

		goto done;

	}

	if (priv->currenttxskb) {

		lbs_pr_err("%s while TX skb pending\n", __func__);

		priv->stats.tx_dropped++;

		goto done;

	}



	netif_stop_queue(priv->dev);

	if (priv->mesh_dev)

		netif_stop_queue(priv->mesh_dev);



	if (lbs_process_tx(priv, skb) == 0)

		dev->trans_start = jiffies;

done:

	lbs_deb_leave_args(LBS_DEB_TX, "ret %d", ret);

	return ret;

}



/**

 * @brief Mark mesh packets and handover them to lbs_hard_start_xmit

 *

drivers/net/wireless/libertas/tx.c

+32 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static u32 convert_radiotap_rate_to_mv(u8 rate) 
 *  @param skb     A pointer to skb which includes TX packet

 *  @return 	   0 or -1

 */

int lbs_process_tx(struct lbs_private *priv, struct sk_buff *skb)

static int lbs_process_tx(struct lbs_private *priv, struct sk_buff *skb)

{

	int ret = -1;

	struct txpd localtxpd;
@@ -179,6 +179,37 @@ int lbs_process_tx(struct lbs_private *priv, struct sk_buff *skb) 
	return ret;

}



int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)

{

	int ret = 0;

	struct lbs_private *priv = dev->priv;



	lbs_deb_enter(LBS_DEB_TX);



	/* We could return NETDEV_TX_BUSY here, but I'd actually 

	   like to get the point where we can BUG() */

	if (priv->dnld_sent) {

		lbs_pr_err("%s while dnld_sent\n", __func__);

		priv->stats.tx_dropped++;

		goto done;

	}

	if (priv->currenttxskb) {

		lbs_pr_err("%s while TX skb pending\n", __func__);

		priv->stats.tx_dropped++;

		goto done;

	}



	netif_stop_queue(priv->dev);

	if (priv->mesh_dev)

		netif_stop_queue(priv->mesh_dev);



	if (lbs_process_tx(priv, skb) == 0)

		dev->trans_start = jiffies;

done:

	lbs_deb_leave_args(LBS_DEB_TX, "ret %d", ret);

	return ret;

}



/**

 *  @brief This function sends to the host the last transmitted packet,

 *  filling the radiotap headers with transmission information.