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

Commit c71cd019 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes' of... 

Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
parents efa5bf1d 412e8a0e

drivers/net/wireless/libertas/decl.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ u32 libertas_index_to_data_rate(u8 index); 
u8 libertas_data_rate_to_index(u32 rate);

void libertas_get_fwversion(wlan_adapter * adapter, char *fwversion, int maxlen);



int libertas_upload_rx_packet(wlan_private * priv, struct sk_buff *skb);

void libertas_upload_rx_packet(wlan_private * priv, struct sk_buff *skb);



/** The proc fs interface */

int libertas_process_rx_command(wlan_private * priv);

drivers/net/wireless/libertas/fw.c

+9 −5
Original line number Diff line number Diff line
@@ -333,18 +333,22 @@ static void command_timer_fn(unsigned long data) 
	unsigned long flags;



	ptempnode = adapter->cur_cmd;

	if (ptempnode == NULL) {

		lbs_pr_debug(1, "PTempnode Empty\n");

		return;

	}



	cmd = (struct cmd_ds_command *)ptempnode->bufvirtualaddr;

	if (!cmd) {

		lbs_pr_debug(1, "cmd is NULL\n");

		return;

	}



	lbs_pr_info("command_timer_fn fired (%x)\n", cmd->command);



	if (!adapter->fw_ready)

		return;



	if (ptempnode == NULL) {

		lbs_pr_debug(1, "PTempnode Empty\n");

		return;

	}



	spin_lock_irqsave(&adapter->driver_lock, flags);

	adapter->cur_cmd = NULL;

	spin_unlock_irqrestore(&adapter->driver_lock, flags);

drivers/net/wireless/libertas/rx.c

+5 −19
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static void wlan_compute_rssi(wlan_private * priv, struct rxpd *p_rx_pd) 
	LEAVE();

}



int libertas_upload_rx_packet(wlan_private * priv, struct sk_buff *skb)

void libertas_upload_rx_packet(wlan_private * priv, struct sk_buff *skb)

{

	lbs_pr_debug(1, "skb->data=%p\n", skb->data);
@@ -148,8 +148,6 @@ int libertas_upload_rx_packet(wlan_private * priv, struct sk_buff *skb) 
	skb->ip_summed = CHECKSUM_UNNECESSARY;



	netif_rx(skb);



	return 0;

}



/**
@@ -269,15 +267,11 @@ int libertas_process_rxed_packet(wlan_private * priv, struct sk_buff *skb) 
	wlan_compute_rssi(priv, p_rx_pd);



	lbs_pr_debug(1, "RX Data: size of actual packet = %d\n", skb->len);

	if (libertas_upload_rx_packet(priv, skb)) {

		lbs_pr_debug(1, "RX error: libertas_upload_rx_packet"

		       " returns failure\n");

		ret = -1;

		goto done;

	}

	priv->stats.rx_bytes += skb->len;

	priv->stats.rx_packets++;



	libertas_upload_rx_packet(priv, skb);



	ret = 0;

done:

	LEAVE();
@@ -438,22 +432,14 @@ static int process_rxed_802_11_packet(wlan_private * priv, struct sk_buff *skb) 
	wlan_compute_rssi(priv, prxpd);



	lbs_pr_debug(1, "RX Data: size of actual packet = %d\n", skb->len);



	if (libertas_upload_rx_packet(priv, skb)) {

		lbs_pr_debug(1, "RX error: libertas_upload_rx_packet "

			"returns failure\n");

		ret = -1;

		goto done;

	}



	priv->stats.rx_bytes += skb->len;

	priv->stats.rx_packets++;



	libertas_upload_rx_packet(priv, skb);



	ret = 0;

done:

	LEAVE();



	skb->protocol = __constant_htons(0x0019);	/* ETH_P_80211_RAW */



	return (ret);

}