aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/iface.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-05-15 03:34:44 -0400
committerDavid S. Miller <davem@davemloft.net>2008-05-15 03:34:44 -0400
commit63fe46da9c380b3f2bbdf3765044649517cc717c (patch)
tree9478c1aca1d692b408955aea20c9cd9a37e589c0 /net/mac80211/iface.c
parent99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff)
parent066b2118976e6e7cc50eed39e2747c75343a23c4 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-4965-rs.c drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r--net/mac80211/iface.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index f41c7e0de622..4a8062f8b1cc 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -53,6 +53,15 @@ int ieee80211_if_add(struct net_device *dev, const char *name,
53 if (!ndev) 53 if (!ndev)
54 return -ENOMEM; 54 return -ENOMEM;
55 55
56 ndev->needed_headroom = local->tx_headroom +
57 4*6 /* four MAC addresses */
58 + 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
59 + 6 /* mesh */
60 + 8 /* rfc1042/bridge tunnel */
61 - ETH_HLEN /* ethernet hard_header_len */
62 + IEEE80211_ENCRYPT_HEADROOM;
63 ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
64
56 ret = dev_alloc_name(ndev, ndev->name); 65 ret = dev_alloc_name(ndev, ndev->name);
57 if (ret < 0) 66 if (ret < 0)
58 goto fail; 67 goto fail;