aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2007-06-04 20:05:23 -0400
committerJohn W. Linville <linville@tuxdriver.com>2007-06-12 14:02:41 -0400
commit2fb3bd6a23e5d37889a78b6a13a124fa7c586009 (patch)
treef1e31248ced0b82a92ef3c7ccb435de25105b9d0
parentfff47f108d7bd9f80b223cd187e09dbb0cb89114 (diff)
downloadkernel_samsung_smdk4412-2fb3bd6a23e5d37889a78b6a13a124fa7c586009.zip
kernel_samsung_smdk4412-2fb3bd6a23e5d37889a78b6a13a124fa7c586009.tar.gz
kernel_samsung_smdk4412-2fb3bd6a23e5d37889a78b6a13a124fa7c586009.tar.bz2
[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>
-rw-r--r--drivers/net/wireless/libertas/rx.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 5d70a76..88d9d2d 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);