From ac48f92dc23dac0dac4ab5535a2dcbbce1556357 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 4 Jun 2007 20:05:23 -0400 Subject: [PATCH] --- yaml --- r: 57690 b: refs/heads/master c: 2fb3bd6a23e5d37889a78b6a13a124fa7c586009 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/rx.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3a585b2ac912..9526321cd00a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fff47f108d7bd9f80b223cd187e09dbb0cb89114 +refs/heads/master: 2fb3bd6a23e5d37889a78b6a13a124fa7c586009 diff --git a/trunk/drivers/net/wireless/libertas/rx.c b/trunk/drivers/net/wireless/libertas/rx.c index 5d70a7625150..88d9d2d787d5 100644 --- a/trunk/drivers/net/wireless/libertas/rx.c +++ b/trunk/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);