From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
To: Youquan Song <youquan.song@linux.intel.com>
Cc: Luis Rodriguez <Luis.Rodriguez@Atheros.com>,
"hui.xiao@intel.com" <hui.xiao@intel.com>,
"chaohong.guo@intel.com" <chaohong.guo@intel.com>,
"youquan.song@intel.com" <youquan.song@intel.com>,
linux-wireless <linux-wireless@vger.kernel.org>
Subject: Re: [PATCH] compat-wireless: Fix USHRT_MAX undefine before 2.6.35
Date: Wed, 17 Nov 2010 11:39:54 -0800 [thread overview]
Message-ID: <20101117193954.GD2268@tux> (raw)
In-Reply-To: <20101117201723.GA29982@linux-youquan.bj.intel.com>
On Wed, Nov 17, 2010 at 12:17:24PM -0800, Youquan Song wrote:
> Since 2.6.35, USHORT_MAX change to USHRT_MAX, which also need be updated in
> compat-wireless
>
> Signed-off-by: Youquan Song <youquan.song@intel.com>
> Signed-off-by: Hui Xiao <hui.xiao@intel.com>
> ---
>
>
> diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
> index 6d8f897..d7ff02f 100644
> --- a/net/mac80211/sta_info.c
> +++ b/net/mac80211/sta_info.c
> @@ -258,7 +258,11 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
> skb_queue_head_init(&sta->tx_filtered);
>
> for (i = 0; i < NUM_RX_DATA_QUEUES; i++)
> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2.6.35))
> sta->last_seq_ctrl[i] = cpu_to_le16(USHRT_MAX);
> +#else
> + sta->last_seq_ctrl[i] = cpu_to_le16(USHORT_MAX);
> +#endif
>
> #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
> wiphy_debug(local->hw.wiphy, "Allocated STA %pM\n", sta->sta.addr);
Can you just #define USHRT_MAX USHORT_MAX for older kernels through compat.git ?
git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/compat.git
Luis
parent reply other threads:[~2010-11-17 19:39 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <20101117201723.GA29982@linux-youquan.bj.intel.com>]
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=20101117193954.GD2268@tux \
--to=lrodriguez@atheros.com \
--cc=Luis.Rodriguez@Atheros.com \
--cc=chaohong.guo@intel.com \
--cc=hui.xiao@intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=youquan.song@intel.com \
--cc=youquan.song@linux.intel.com \
/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