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

[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
...@@ -378,9 +378,10 @@ islpci_eth_receive(islpci_private *priv) ...@@ -378,9 +378,10 @@ islpci_eth_receive(islpci_private *priv)
display_buffer((char *) skb->data, skb->len); display_buffer((char *) skb->data, skb->len);
#endif #endif
/* take care of monitor mode and spy monitoring. */ /* 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); discard = islpci_monitor_rx(priv, &skb);
else { } else {
if (unlikely(skb->data[2 * ETH_ALEN] == 0)) { if (unlikely(skb->data[2 * ETH_ALEN] == 0)) {
/* The packet has a rx_annex. Read it for spy monitoring, Then /* The packet has a rx_annex. Read it for spy monitoring, Then
* remove it, while keeping the 2 leading MAC addr. * remove it, while keeping the 2 leading MAC addr.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment