* [PATCH 1/1] mac80211: fix warning for un-used parameter
@ 2010-08-20 21:49 wey-yi.w.guy
2010-08-21 10:04 ` Johannes Berg
0 siblings, 1 reply; 3+ messages in thread
From: wey-yi.w.guy @ 2010-08-20 21:49 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, Wey-Yi Guy
From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
mesh_hdr only used when CONFIG_MAC80211_MESH is defined
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
---
net/mac80211/tx.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index bc4fefc..364d56a 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1701,7 +1701,9 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
u16 ethertype, hdrlen, meshhdrlen = 0;
__le16 fc;
struct ieee80211_hdr hdr;
+#ifdef CONFIG_MAC80211_MESH
struct ieee80211s_hdr mesh_hdr;
+#endif
const u8 *encaps_data;
int encaps_len, skip_header_bytes;
int nh_pos, h_pos;
--
1.6.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] mac80211: fix warning for un-used parameter
2010-08-20 21:49 [PATCH 1/1] mac80211: fix warning for un-used parameter wey-yi.w.guy
@ 2010-08-21 10:04 ` Johannes Berg
2010-08-21 14:18 ` Guy, Wey-Yi W
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Berg @ 2010-08-21 10:04 UTC (permalink / raw)
To: wey-yi.w.guy; +Cc: linux-wireless
On Fri, 2010-08-20 at 14:49 -0700, wey-yi.w.guy@intel.com wrote:
> @@ -1701,7 +1701,9 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
> u16 ethertype, hdrlen, meshhdrlen = 0;
> __le16 fc;
> struct ieee80211_hdr hdr;
> +#ifdef CONFIG_MAC80211_MESH
> struct ieee80211s_hdr mesh_hdr;
> +#endif
Good catch. I think just adding __maybe_unused would be better though?
johannes
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH 1/1] mac80211: fix warning for un-used parameter
2010-08-21 10:04 ` Johannes Berg
@ 2010-08-21 14:18 ` Guy, Wey-Yi W
0 siblings, 0 replies; 3+ messages in thread
From: Guy, Wey-Yi W @ 2010-08-21 14:18 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-wireless
LS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCkZyb206IEpvaGFubmVzIEJlcmcgW21haWx0bzpq
b2hhbm5lc0BzaXBzb2x1dGlvbnMubmV0XSANClNlbnQ6IFNhdHVyZGF5LCBBdWd1c3QgMjEsIDIw
MTAgMzowNCBBTQ0KVG86IEd1eSwgV2V5LVlpIFcNCkNjOiBsaW51eC13aXJlbGVzc0B2Z2VyLmtl
cm5lbC5vcmcNClN1YmplY3Q6IFJlOiBbUEFUQ0ggMS8xXSBtYWM4MDIxMTogZml4IHdhcm5pbmcg
Zm9yIHVuLXVzZWQgcGFyYW1ldGVyDQoNCk9uIEZyaSwgMjAxMC0wOC0yMCBhdCAxNDo0OSAtMDcw
MCwgd2V5LXlpLncuZ3V5QGludGVsLmNvbSB3cm90ZToNCg0KPiBAQCAtMTcwMSw3ICsxNzAxLDkg
QEAgbmV0ZGV2X3R4X3QgaWVlZTgwMjExX3N1YmlmX3N0YXJ0X3htaXQoc3RydWN0IHNrX2J1ZmYg
KnNrYiwNCj4gIAl1MTYgZXRoZXJ0eXBlLCBoZHJsZW4sICBtZXNoaGRybGVuID0gMDsNCj4gIAlf
X2xlMTYgZmM7DQo+ICAJc3RydWN0IGllZWU4MDIxMV9oZHIgaGRyOw0KPiArI2lmZGVmIENPTkZJ
R19NQUM4MDIxMV9NRVNIDQo+ICAJc3RydWN0IGllZWU4MDIxMXNfaGRyIG1lc2hfaGRyOw0KPiAr
I2VuZGlmDQoNCkdvb2QgY2F0Y2guIEkgdGhpbmsganVzdCBhZGRpbmcgX19tYXliZV91bnVzZWQg
d291bGQgYmUgYmV0dGVyIHRob3VnaD8NCg0KWWVhaCwgY291bGQgZG8gdGhhdCwgd2lsbCByZS1z
dWJtaXQNCg0KV2V5DQoNCg==
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-08-21 14:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-20 21:49 [PATCH 1/1] mac80211: fix warning for un-used parameter wey-yi.w.guy
2010-08-21 10:04 ` Johannes Berg
2010-08-21 14:18 ` Guy, Wey-Yi W
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).