diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-17 17:29:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-17 17:29:22 -0400 |
| commit | f10023a4ef3f5cc05457b059c6880bc447adfa1f (patch) | |
| tree | e5d229bb9719b0be27289a6736d2e22254da06f0 /net/mac80211 | |
| parent | 4ada8107f465b97326751de66d3c11ed78bf8214 (diff) | |
| parent | 640c65eae673d2caf6e7bf61c1eb4e9513b88fda (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/tx.c | 2 |
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) | |||
| 752 | skb_copy_queue_mapping(frag, first); | 752 | skb_copy_queue_mapping(frag, first); |
| 753 | 753 | ||
| 754 | frag->do_not_encrypt = first->do_not_encrypt; | 754 | frag->do_not_encrypt = first->do_not_encrypt; |
| 755 | frag->dev = first->dev; | ||
| 756 | frag->iif = first->iif; | ||
| 755 | 757 | ||
| 756 | pos += copylen; | 758 | pos += copylen; |
| 757 | left -= copylen; | 759 | left -= copylen; |