From: Dan Williams Date: Tue, 5 Jun 2007 00:05:23 +0000 (-0400) Subject: [PATCH] libertas: actually send mesh frames to mesh netdev X-Git-Tag: v2.6.22-rc5~44^2~1^2~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2fb3bd6a23e5d37889a78b6a13a124fa7c586009;p=linux-2.6-omap-h63xx.git [PATCH] libertas: actually send mesh frames to mesh netdev Found by Luis; got broken during module split. Signed-off-by: Dan Williams Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c index 5d70a762515..88d9d2d787d 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);