diff options
| author | Joel A Fernandes <agnel.joel@gmail.com> | 2011-01-10 00:44:23 -0600 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-01-19 11:36:07 -0500 |
| commit | 9d52501b421450ddd9e000c9788ac3be0e44ef1c (patch) | |
| tree | e0a1c5a7b9fc179a5fd4822e4a7dff954084e56a /net/mac80211 | |
| parent | 04cf53f465049c7c509aac7b776f75d38ef68e69 (diff) | |
| download | linux-stable-9d52501b421450ddd9e000c9788ac3be0e44ef1c.tar.gz linux-stable-9d52501b421450ddd9e000c9788ac3be0e44ef1c.tar.bz2 linux-stable-9d52501b421450ddd9e000c9788ac3be0e44ef1c.zip | |
mac80211: Rewrote code for checking if destinations are proxied.
Rewrote code for checking if the destination is proxied by a mesh portal, to facilitate better
understanding of the functionality.
Signed-off-by: Joel A Fernandes <agnel.joel@gmail.com>
Acked-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/tx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 5950e3abead9..dc261bbba522 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1815,19 +1815,19 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, mppath = mpp_path_lookup(skb->data, sdata); /* - * Do not use address extension, if it is a packet from - * the same interface and the destination is not being - * proxied by any other mest point. + * Use address extension if it is a packet from + * another interface or if we know the destination + * is being proxied by a portal (i.e. portal address + * differs from proxied address) */ if (compare_ether_addr(sdata->vif.addr, skb->data + ETH_ALEN) == 0 && - (!mppath || !compare_ether_addr(mppath->mpp, skb->data))) { + !(mppath && compare_ether_addr(mppath->mpp, skb->data))) { hdrlen = ieee80211_fill_mesh_addresses(&hdr, &fc, skb->data, skb->data + ETH_ALEN); meshhdrlen = ieee80211_new_mesh_header(&mesh_hdr, sdata, NULL, NULL); } else { - /* packet from other interface */ int is_mesh_mcast = 1; const u8 *mesh_da; |