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

Commit 20c9d198 authored by Björn Steinbrink's avatar Björn Steinbrink Committed by John W. Linville
Browse files

[PATCH] prism54: fix monitor mode oops 



Manually set the device of a skb for prism54 cards that are in monitor
mode as we never call eth_type_trans in that case.

Signed-off-by: default avatarBjörn Steinbrink <B.Steinbrink@gmx.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c420bc9f

drivers/net/wireless/prism54/islpci_eth.c

+3 −2
Original line number Diff line number Diff line
@@ -378,9 +378,10 @@ islpci_eth_receive(islpci_private *priv) 
	display_buffer((char *) skb->data, skb->len);

#endif

	/* take care of monitor mode and spy monitoring. */

	if (unlikely(priv->iw_mode == IW_MODE_MONITOR))

	if (unlikely(priv->iw_mode == IW_MODE_MONITOR)) {

		skb->dev = ndev;

		discard = islpci_monitor_rx(priv, &skb);

	else {

	} else {

		if (unlikely(skb->data[2 * ETH_ALEN] == 0)) {

			/* The packet has a rx_annex. Read it for spy monitoring, Then

			 * remove it, while keeping the 2 leading MAC addr.