* [PATCH 0/2] trivial: fix some compilation warnings @ 2010-09-12 11:10 Felipe Contreras 2010-09-12 11:10 ` [PATCH 1/2] autofs4: fix compilation warning Felipe Contreras 2010-09-12 11:10 ` [PATCH 2/2] mac80211: " Felipe Contreras 0 siblings, 2 replies; 5+ messages in thread From: Felipe Contreras @ 2010-09-12 11:10 UTC (permalink / raw) To: linux-kernel; +Cc: Jiri Kosina, Felipe Contreras Pretty trivial compilation warning fixes. Felipe Contreras (2): autofs4: fix compilation warning mac80211: fix compilation warning fs/autofs4/root.c | 2 ++ net/mac80211/tx.c | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) -- 1.7.2.3 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] autofs4: fix compilation warning 2010-09-12 11:10 [PATCH 0/2] trivial: fix some compilation warnings Felipe Contreras @ 2010-09-12 11:10 ` Felipe Contreras 2010-09-12 11:10 ` [PATCH 2/2] mac80211: " Felipe Contreras 1 sibling, 0 replies; 5+ messages in thread From: Felipe Contreras @ 2010-09-12 11:10 UTC (permalink / raw) To: linux-kernel Cc: Jiri Kosina, Felipe Contreras, Ian Kent, Andrew Morton, Frederic Weisbecker, Al Viro, H. Peter Anvin, autofs fs/autofs4/root.c:31: warning: ‘autofs4_root_compat_ioctl’ declared ‘static’ but never defined Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- fs/autofs4/root.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index cb1bd38..87f22ae 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c @@ -28,7 +28,9 @@ static int autofs4_dir_unlink(struct inode *,struct dentry *); static int autofs4_dir_rmdir(struct inode *,struct dentry *); static int autofs4_dir_mkdir(struct inode *,struct dentry *,int); static long autofs4_root_ioctl(struct file *,unsigned int,unsigned long); +#ifdef CONFIG_COMPAT static long autofs4_root_compat_ioctl(struct file *,unsigned int,unsigned long); +#endif static int autofs4_dir_open(struct inode *inode, struct file *file); static struct dentry *autofs4_lookup(struct inode *,struct dentry *, struct nameidata *); static void *autofs4_follow_link(struct dentry *, struct nameidata *); -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] mac80211: fix compilation warning 2010-09-12 11:10 [PATCH 0/2] trivial: fix some compilation warnings Felipe Contreras 2010-09-12 11:10 ` [PATCH 1/2] autofs4: fix compilation warning Felipe Contreras @ 2010-09-12 11:10 ` Felipe Contreras 2010-09-14 5:17 ` Johannes Berg 1 sibling, 1 reply; 5+ messages in thread From: Felipe Contreras @ 2010-09-12 11:10 UTC (permalink / raw) To: linux-kernel Cc: Jiri Kosina, Felipe Contreras, Johannes Berg, John W. Linville, David S. Miller, Kalle Valo, Felix Fietkau, Jouni Malinen, linux-wireless, netdev net/mac80211/tx.c: In function ‘ieee80211_subif_start_xmit’: net/mac80211/tx.c:1702: warning: unused variable ‘mesh_hdr’ Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- net/mac80211/tx.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index c54db96..323a6b5 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1699,7 +1699,6 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, u16 ethertype, hdrlen, meshhdrlen = 0; __le16 fc; struct ieee80211_hdr hdr; - struct ieee80211s_hdr mesh_hdr; const u8 *encaps_data; int encaps_len, skip_header_bytes; int nh_pos, h_pos; @@ -1755,7 +1754,9 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, hdrlen = 30; break; #ifdef CONFIG_MAC80211_MESH - case NL80211_IFTYPE_MESH_POINT: + case NL80211_IFTYPE_MESH_POINT: { + struct ieee80211s_hdr mesh_hdr; + if (!sdata->u.mesh.mshcfg.dot11MeshTTL) { /* Do not send frames with mesh_ttl == 0 */ sdata->u.mesh.mshstats.dropped_frames_ttl++; @@ -1813,6 +1814,7 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, } break; + } #endif case NL80211_IFTYPE_STATION: memcpy(hdr.addr1, sdata->u.mgd.bssid, ETH_ALEN); -- 1.7.2.3 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] mac80211: fix compilation warning 2010-09-12 11:10 ` [PATCH 2/2] mac80211: " Felipe Contreras @ 2010-09-14 5:17 ` Johannes Berg 2010-09-14 6:09 ` Jarek Poplawski 0 siblings, 1 reply; 5+ messages in thread From: Johannes Berg @ 2010-09-14 5:17 UTC (permalink / raw) To: Felipe Contreras Cc: linux-kernel, Jiri Kosina, John W. Linville, David S. Miller, Kalle Valo, Felix Fietkau, Jouni Malinen, linux-wireless, netdev On Sun, 2010-09-12 at 14:10 +0300, Felipe Contreras wrote: > struct ieee80211_hdr hdr; > - struct ieee80211s_hdr mesh_hdr; > const u8 *encaps_data; > int encaps_len, skip_header_bytes; > int nh_pos, h_pos; > @@ -1755,7 +1754,9 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, > hdrlen = 30; > break; > #ifdef CONFIG_MAC80211_MESH > - case NL80211_IFTYPE_MESH_POINT: > + case NL80211_IFTYPE_MESH_POINT: { > + struct ieee80211s_hdr mesh_hdr; > + ... might be nicer to just add __maybe_unused. johannes ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] mac80211: fix compilation warning 2010-09-14 5:17 ` Johannes Berg @ 2010-09-14 6:09 ` Jarek Poplawski 0 siblings, 0 replies; 5+ messages in thread From: Jarek Poplawski @ 2010-09-14 6:09 UTC (permalink / raw) To: Johannes Berg Cc: Felipe Contreras, linux-kernel, Jiri Kosina, John W. Linville, David S. Miller, Kalle Valo, Felix Fietkau, Jouni Malinen, linux-wireless, netdev On 2010-09-14 07:17, Johannes Berg wrote: > On Sun, 2010-09-12 at 14:10 +0300, Felipe Contreras wrote: > >> struct ieee80211_hdr hdr; >> - struct ieee80211s_hdr mesh_hdr; >> const u8 *encaps_data; >> int encaps_len, skip_header_bytes; >> int nh_pos, h_pos; >> @@ -1755,7 +1754,9 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, >> hdrlen = 30; >> break; >> #ifdef CONFIG_MAC80211_MESH >> - case NL80211_IFTYPE_MESH_POINT: >> + case NL80211_IFTYPE_MESH_POINT: { >> + struct ieee80211s_hdr mesh_hdr; >> + > > ... > > might be nicer to just add __maybe_unused. > > johannes > Or at least more consistent with the fix in net-next ;-) Jarek P. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-09-14 6:09 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-09-12 11:10 [PATCH 0/2] trivial: fix some compilation warnings Felipe Contreras 2010-09-12 11:10 ` [PATCH 1/2] autofs4: fix compilation warning Felipe Contreras 2010-09-12 11:10 ` [PATCH 2/2] mac80211: " Felipe Contreras 2010-09-14 5:17 ` Johannes Berg 2010-09-14 6:09 ` Jarek Poplawski
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox