From: "John W. Linville" <linville@tuxdriver.com>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: linux-wireless@vger.kernel.org, Ivo van Doorn <IvDoorn@gmail.com>,
"David S. Miller" <davem@davemloft.net>
Subject: Re: [PATCH 5/5] mac80211: move TX info into skb->cb
Date: Wed, 21 May 2008 23:10:21 -0400 [thread overview]
Message-ID: <20080522031021.GB10561@tuxdriver.com> (raw)
In-Reply-To: <20080515105948.820956000@sipsolutions.net>
On Thu, May 15, 2008 at 12:55:29PM +0200, Johannes Berg wrote:
> --- everything.orig/net/mac80211/tx.c 2008-05-15 12:09:40.000000000 +0200
> +++ everything/net/mac80211/tx.c 2008-05-15 12:09:59.000000000 +0200
> @@ -1325,9 +1324,10 @@ int ieee80211_master_start_xmit(struct s
> dev_kfree_skb(skb);
> return 0;
> }
> +
> osdata = IEEE80211_DEV_TO_SUB_IF(odev);
>
> - encrypt = !(pkt_data->flags & IEEE80211_TXPD_DO_NOT_ENCRYPT);
> + encrypt = !(info->flags & IEEE80211_TX_CTL_DO_NOT_ENCRYPT);
>
> headroom = osdata->local->tx_headroom;
> if (encrypt)
This hunk didn't apply, please review the merge results.
John
--
John W. Linville
linville@tuxdriver.com
next prev parent reply other threads:[~2008-05-22 3:28 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-15 10:55 [PATCH 0/5] mac80211 fixes & improvements Johannes Berg
2008-05-15 10:55 ` [PATCH 1/5] mac80211: fix bugs in queue handling functions Johannes Berg
2008-05-15 10:55 ` [PATCH 2/5] mac80211: let drivers wake but not start queues Johannes Berg
2008-05-15 10:55 ` [PATCH 3/5] mac80211: use rate index in TX control Johannes Berg
2008-05-15 10:55 ` [PATCH 4/5] mac80211: reorder some transmit handlers Johannes Berg
2008-05-15 10:55 ` [PATCH 5/5] mac80211: move TX info into skb->cb Johannes Berg
2008-05-15 11:11 ` Johannes Berg
2008-05-15 11:32 ` Ivo van Doorn
2008-05-15 11:22 ` Johannes Berg
2008-05-15 11:58 ` Ivo van Doorn
2008-05-15 11:49 ` Johannes Berg
2008-05-22 3:10 ` John W. Linville [this message]
2008-05-22 7:25 ` Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080522031021.GB10561@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=IvDoorn@gmail.com \
--cc=davem@davemloft.net \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).