diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-02-07 13:44:14 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-07 13:44:14 -0500 |
| commit | 0f96b860bc5e97d4776d0cb375c7ca1f4864f9e9 (patch) | |
| tree | ef46bd077c1710a0474b5b3b31c543783197a274 /net/mac80211/tx.c | |
| parent | ee262ad827f89e2dc7851ec2986953b5b125c6bc (diff) | |
| parent | 348f7d4adee97f222e3ad9ff97956ca3793d11c6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 27c990bf2320..97a02d3f7d87 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -878,7 +878,7 @@ static int ieee80211_fragment(struct ieee80211_tx_data *tx, } /* adjust first fragment's length */ - skb->len = hdrlen + per_fragm; + skb_trim(skb, hdrlen + per_fragm); return 0; } |