Prev: soc/sh: Fix I2C dependency for SND_FSI_AK4642 and SND_FSI_DA7210
Next: [PATCH] module: initialize module dynamic debug later
From: Herbert Xu on 16 Jun 2010 00:00
On Wed, Jun 16, 2010 at 01:48:48PM +1000, Stephen Rothwell wrote:
> Hi Dave,
>
> After merging the final tree, today's linux-next build (powerpc
> ppc44x_defconfig) produced this warning:
>
> net/bridge/br_forward.c: In function '__br_deliver':
> net/bridge/br_forward.c:76: warning: passing argument 1 of 'br_netpoll_send_skb' discards qualifiers from pointer target type
> net/bridge/br_private.h:308: note: expected 'struct net_bridge_port *' but argument is of type 'const struct net_bridge_port *'

Indeed, this patch should fix the warning.

bridge: Add const to dummy br_netpoll_send_skb

The version of br_netpoll_send_skb used when netpoll is off is
missing a const thus causing a warning.

Signed-off-by: Herbert Xu <herbert(a)gondor.apana.org.au>

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 29f6d66..4ea7986 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -300,7 +300,7 @@ static inline struct netpoll_info *br_netpoll_info(struct net_bridge *br)
return NULL;
}

-static inline void br_netpoll_send_skb(struct net_bridge_port *p,
+static inline void br_netpoll_send_skb(const struct net_bridge_port *p,
struct sk_buff *skb)
{
}

Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert(a)gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: soc/sh: Fix I2C dependency for SND_FSI_AK4642 and SND_FSI_DA7210
Next: [PATCH] module: initialize module dynamic debug later