summaryrefslogtreecommitdiffstats
path: root/net/mac80211/tx.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-17 14:29:22 -0700
committerDavid S. Miller <davem@davemloft.net>2009-03-17 14:29:22 -0700
commitf10023a4ef3f5cc05457b059c6880bc447adfa1f (patch)
treee5d229bb9719b0be27289a6736d2e22254da06f0 /net/mac80211/tx.c
parent4ada8107f465b97326751de66d3c11ed78bf8214 (diff)
parent640c65eae673d2caf6e7bf61c1eb4e9513b88fda (diff)
downloadlinux-f10023a4ef3f5cc05457b059c6880bc447adfa1f.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r--net/mac80211/tx.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 94de5033f0b6..37e3d5ef7e3f 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -752,6 +752,8 @@ ieee80211_tx_h_fragment(struct ieee80211_tx_data *tx)
skb_copy_queue_mapping(frag, first);
frag->do_not_encrypt = first->do_not_encrypt;
+ frag->dev = first->dev;
+ frag->iif = first->iif;
pos += copylen;
left -= copylen;