---

yaml --- r: 96565 b: refs/heads/master c: f3994ec h: refs/heads/master i: 96563: 6a34f3e v: v3
git-mirror · May 13, 2008 · b50bb5a · b50bb5a
1 parent dbc59b1
commit b50bb5a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5184d267c1aedb9b7a8cc44e08ff6b8d382c3b5
+refs/heads/master: f3994eceebf64cf356a82ffb2718ef538eb8d4f4
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
@@ -54,6 +54,15 @@ int ieee80211_if_add(struct net_device *dev, const char *name,
 	if (!ndev)
 		return -ENOMEM;
 
+	ndev->needed_headroom = local->tx_headroom +
+				4*6 /* four MAC addresses */
+				+ 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
+				+ 6 /* mesh */
+				+ 8 /* rfc1042/bridge tunnel */
+				- ETH_HLEN /* ethernet hard_header_len */
+				+ IEEE80211_ENCRYPT_HEADROOM;
+	ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
+
 	ret = dev_alloc_name(ndev, ndev->name);
 	if (ret < 0)
 		goto fail;