diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-07-29 11:32:07 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-07-29 16:55:08 -0400 |
| commit | d0f09804144fd9471a13cf4d80e66842c7fa114f (patch) | |
| tree | 4a1f0f78bad7e5be4ad400397a19d4b8d6fbbdcd /net/core | |
| parent | 0ccd58fc03f40529f66190b1a41e92a732d2bda8 (diff) | |
| download | linux-d0f09804144fd9471a13cf4d80e66842c7fa114f.tar.gz linux-d0f09804144fd9471a13cf4d80e66842c7fa114f.tar.bz2 linux-d0f09804144fd9471a13cf4d80e66842c7fa114f.zip | |
mac80211: partially fix skb->cb use
This patch fixes mac80211 to not use the skb->cb over the queue step
from virtual interfaces to the master. The patch also, for now,
disables aggregation because that would still require requeuing,
will fix that in a separate patch. There are two other places (software
requeue and powersaving stations) where requeue can happen, but that is
not currently used by any drivers/not possible to use respectively.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/skbuff.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 4e0c92274189..84640172d65d 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -485,6 +485,9 @@ static struct sk_buff *__skb_clone(struct sk_buff *n, struct sk_buff *skb) C(head); C(data); C(truesize); +#if defined(CONFIG_MAC80211) || defined(CONFIG_MAC80211_MODULE) + C(do_not_encrypt); +#endif atomic_set(&n->users, 1); atomic_inc(&(skb_shinfo(skb)->dataref)); |