From: Dan Williams <dcbw@redhat.com>
Date: Tue, 5 Jun 2007 00:05:23 +0000 (-0400)
Subject: [PATCH] libertas: actually send mesh frames to mesh netdev
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2fb3bd6a23e5d37889a78b6a13a124fa7c586009;p=linux-beck.git

[PATCH] libertas: actually send mesh frames to mesh netdev

Found by Luis; got broken during module split.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 5d70a7625150..88d9d2d787d5 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -141,10 +141,9 @@ void libertas_upload_rx_packet(wlan_private * priv, struct sk_buff *skb)
 	lbs_deb_rx("skb->data %p\n", skb->data);
 
 	if (priv->mesh_dev && IS_MESH_FRAME(skb))
-		skb->dev = priv->mesh_dev;
+		skb->protocol = eth_type_trans(skb, priv->mesh_dev);
 	else
-		skb->dev = priv->dev;
-	skb->protocol = eth_type_trans(skb, priv->dev);
+		skb->protocol = eth_type_trans(skb, priv->dev);
 	skb->ip_summed = CHECKSUM_UNNECESSARY;
 
 	netif_rx(skb);