]> err.no Git - linux-2.6/commitdiff
[PATCH] libertas: actually send mesh frames to mesh netdev
authorDan Williams <dcbw@redhat.com>
Tue, 5 Jun 2007 00:05:23 +0000 (20:05 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 12 Jun 2007 18:02:41 +0000 (14:02 -0400)
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>
drivers/net/wireless/libertas/rx.c

index 5d70a7625150151ee2ff7f2ace9045b94fc8085f..88d9d2d787d5ae38486736c4e5876c639145fb3f 100644 (file)
@@ -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);