libertas: moveing mesh-related functions into mesh.c

[safe/jmp/linux-2.6] / drivers / net / wireless / libertas / rx.c

diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 9f18a19..2daf8ff 100644 (file)
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -160,15 +160,8 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
        p_rx_pd = (struct rxpd *) skb->data;
        p_rx_pkt = (struct rxpackethdr *) ((u8 *)p_rx_pd +
                le32_to_cpu(p_rx_pd->pkt_ptr));
-       if (priv->mesh_dev) {
-               if (priv->mesh_fw_ver == MESH_FW_OLD) {
-                       if (p_rx_pd->rx_control & RxPD_MESH_FRAME)
-                               dev = priv->mesh_dev;
-               } else if (priv->mesh_fw_ver == MESH_FW_NEW) {
-                       if (p_rx_pd->u.bss.bss_num == MESH_IFACE_ID)
-                               dev = priv->mesh_dev;
-               }
-       }
+
+       dev = lbs_mesh_set_dev(priv, dev, p_rx_pd);
 
        lbs_deb_hex(LBS_DEB_RX, "RX Data: Before chop rxpd", skb->data,
                 min_t(unsigned int, skb->len, 100));