diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-02-13 20:43:02 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-13 20:43:02 +0100 |
| commit | 0e028ab0fb2da47fd235dafd4159859892e73d08 (patch) | |
| tree | e9e1348372b413e6b1b503209582b03c9005f614 /net/mac80211/tx.c | |
| parent | mwifiex: add key material v2 support (diff) | |
| parent | rtl8180: Add error check for pci_map_single return value in TX path (diff) | |
| download | linux-0e028ab0fb2da47fd235dafd4159859892e73d08.tar.xz linux-0e028ab0fb2da47fd235dafd4159859892e73d08.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
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 5476a69b45c9..722151fa5dce 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -874,7 +874,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; } |