mac80211: fix use of skb->cb for mesh forwarding

Now we deal with mesh forwarding before the 802.11->802.3 conversion, thus
eliminating a few unnecessary steps. The next hop lookup is called from
ieee80211_master_start_xmit() instead of subif_start_xmit(). Until the next hop
is found, RA in the frame will be all zeroes for frames originating from the
device. For forwarded frames, RA will contain the TA of the received frame,
which will be necessary to send a path error if a next hop is not found.

Signed-off-by: Luis Carlos Cobo <luisca@cozybit.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 5f88a2e6ee50..838ee60492ad 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -388,18 +388,15 @@ void mesh_path_tx_pending(struct mesh_path *mpath)
 void mesh_path_discard_frame(struct sk_buff *skb, struct net_device *dev)
 {
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
         struct mesh_path *mpath;
         u32 dsn = 0;
 
-        if (skb->pkt_type == PACKET_OTHERHOST) {
-                struct ieee80211s_hdr *prev_meshhdr;
-                int mshhdrlen;
+        if (memcmp(hdr->addr4, dev->dev_addr, ETH_ALEN) != 0) {
                 u8 *ra, *da;
 
-                prev_meshhdr = ((struct ieee80211s_hdr *)skb->cb);
-                mshhdrlen = ieee80211_get_mesh_hdrlen(prev_meshhdr);
-                da = skb->data;
-                ra = MESH_PREQ(skb);
+                da = hdr->addr3;
+                ra = hdr->addr2;
                 mpath = mesh_path_lookup(da, dev);
                 if (mpath)
                         dsn = ++mpath->dsn;