diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-19 19:00:04 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-19 19:00:04 -0400 |
| commit | 0344f1c66b544609e867bd24aa7bfa789dfa9830 (patch) | |
| tree | 7f76abc095a90f7ad475417495d3d4f577080ae1 /net/mac80211 | |
| parent | dad9b335c6940de2746a9788eb456d09cf102f81 (diff) | |
| parent | ef3a62d272f033989e83eb1f26505f93f93e3e69 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/tx.c
Diffstat (limited to 'net/mac80211')
| -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 195cb6dd02a0..ce06e791bf43 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
| @@ -1567,7 +1567,7 @@ int ieee80211_subif_start_xmit(struct sk_buff *skb, | |||
| 1567 | * make it big enough for everything we may ever need. | 1567 | * make it big enough for everything we may ever need. |
| 1568 | */ | 1568 | */ |
| 1569 | 1569 | ||
| 1570 | if (head_need > 0 || skb_header_cloned(skb)) { | 1570 | if (head_need > 0 || skb_cloned(skb)) { |
| 1571 | head_need += IEEE80211_ENCRYPT_HEADROOM; | 1571 | head_need += IEEE80211_ENCRYPT_HEADROOM; |
| 1572 | head_need += local->tx_headroom; | 1572 | head_need += local->tx_headroom; |
| 1573 | head_need = max_t(int, 0, head_need); | 1573 | head_need = max_t(int, 0, head_need); |