summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/rx.c
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2007-05-25 11:49:19 -0400
committerJohn W. Linville <linville@tuxdriver.com>2007-06-11 14:28:37 -0400
commit78523daa86cf0b02c4d2f73b962c04ad565e9140 (patch)
tree2be493edecfc3f225979ba33edaddf36a1f6bccb /drivers/net/wireless/libertas/rx.c
parenta46c64108b06ec68337e62e7c2d4b3e8aed74b82 (diff)
downloadkernel-crypto-78523daa86cf0b02c4d2f73b962c04ad565e9140.tar.gz
kernel-crypto-78523daa86cf0b02c4d2f73b962c04ad565e9140.tar.xz
kernel-crypto-78523daa86cf0b02c4d2f73b962c04ad565e9140.zip
[PATCH] libertas: single out mesh code
This patches adds the two functions wlan_add_mesh() and wlan_remove_mesh(), which are responsible for the mshX interface. In a CF driver with a non- mesh-aware firmware you can omit the calls to this functions. Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/rx.c')
-rw-r--r--drivers/net/wireless/libertas/rx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 371cbf17ad4..a0779dc7828 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -140,7 +140,7 @@ void libertas_upload_rx_packet(wlan_private * priv, struct sk_buff *skb)
{
lbs_deb_rx("skb->data %p\n", skb->data);
- if(IS_MESH_FRAME(skb))
+ if (priv->mesh_dev && IS_MESH_FRAME(skb))
skb->dev = priv->mesh_dev;
else
skb->dev = priv->wlan_dev.netdev;