net: compat_mmsghdr must be used in sys_recvmmsg

[safe/jmp/linux-2.6] / net / mac80211 / mesh_hwmp.c

diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index d930198..833b2f3 100644 (file)
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -187,7 +187,7 @@ static int mesh_path_sel_frame_tx(enum mpath_frame_type action, u8 flags,
                memcpy(pos, &target_sn, 4);
        }
 
-       ieee80211_tx_skb(sdata, skb, 1);
+       ieee80211_tx_skb(sdata, skb);
        return 0;
 }
 
@@ -250,7 +250,7 @@ int mesh_path_error_tx(u8 ttl, u8 *target, __le32 target_sn,
        pos += 4;
        memcpy(pos, &target_rcode, 2);
 
-       ieee80211_tx_skb(sdata, skb, 1);
+       ieee80211_tx_skb(sdata, skb);
        return 0;
 }
 
@@ -936,17 +936,16 @@ int mesh_nexthop_lookup(struct sk_buff *skb,
        }
 
        if (mpath->flags & MESH_PATH_ACTIVE) {
-               if (time_after(jiffies, mpath->exp_time +
-                       msecs_to_jiffies(sdata->u.mesh.mshcfg.path_refresh_time))
-                               && !memcmp(sdata->dev->dev_addr, hdr->addr4,
-                                          ETH_ALEN)
-                               && !(mpath->flags & MESH_PATH_RESOLVING)
-                               && !(mpath->flags & MESH_PATH_FIXED)) {
+               if (time_after(jiffies,
+                              mpath->exp_time +
+                              msecs_to_jiffies(sdata->u.mesh.mshcfg.path_refresh_time)) &&
+                   !memcmp(sdata->dev->dev_addr, hdr->addr4, ETH_ALEN) &&
+                   !(mpath->flags & MESH_PATH_RESOLVING) &&
+                   !(mpath->flags & MESH_PATH_FIXED)) {
                        mesh_queue_preq(mpath,
                                        PREQ_Q_F_START | PREQ_Q_F_REFRESH);
                }
-               memcpy(hdr->addr1, mpath->next_hop->sta.addr,
-                               ETH_ALEN);
+               memcpy(hdr->addr1, mpath->next_hop->sta.addr, ETH_ALEN);
        } else {
                struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
                if (!(mpath->flags & MESH_PATH_RESOLVING)) {