* [Patch net-next 2/3] vxlan: use unsigned int instead of unsigned
2013-05-28 8:35 [Patch net-next 1/3] vxlan: remove the unused rcu head from struct vxlan_rdst Cong Wang
@ 2013-05-28 8:35 ` Cong Wang
2013-05-29 6:54 ` David Miller
2013-05-28 8:35 ` [Patch net-next 3/3] vxlan: defer vxlan init as late as possible Cong Wang
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Cong Wang @ 2013-05-28 8:35 UTC (permalink / raw)
To: netdev; +Cc: Stephen Hemminger, David S. Miller, Cong Wang
From: Cong Wang <amwang@redhat.com>
'unsigned int' is slightly better.
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
---
drivers/net/vxlan.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 289d79a..6fc9620 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1269,7 +1269,7 @@ static int vxlan_open(struct net_device *dev)
/* Purge the forwarding table */
static void vxlan_flush(struct vxlan_dev *vxlan)
{
- unsigned h;
+ unsigned int h;
spin_lock_bh(&vxlan->hash_lock);
for (h = 0; h < FDB_HASH_SIZE; ++h) {
@@ -1333,7 +1333,7 @@ static void vxlan_free(struct net_device *dev)
static void vxlan_setup(struct net_device *dev)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
- unsigned h;
+ unsigned int h;
int low, high;
eth_hw_addr_random(dev);
@@ -1459,7 +1459,7 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, __be16 port)
.sin_addr.s_addr = htonl(INADDR_ANY),
};
int rc;
- unsigned h;
+ unsigned int h;
vs = kmalloc(sizeof(*vs), GFP_KERNEL);
if (!vs)
@@ -1722,7 +1722,7 @@ static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
static __net_init int vxlan_init_net(struct net *net)
{
struct vxlan_net *vn = net_generic(net, vxlan_net_id);
- unsigned h;
+ unsigned int h;
INIT_LIST_HEAD(&vn->vxlan_list);
--
1.7.7.6
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Patch net-next 3/3] vxlan: defer vxlan init as late as possible
2013-05-28 8:35 [Patch net-next 1/3] vxlan: remove the unused rcu head from struct vxlan_rdst Cong Wang
2013-05-28 8:35 ` [Patch net-next 2/3] vxlan: use unsigned int instead of unsigned Cong Wang
@ 2013-05-28 8:35 ` Cong Wang
2013-05-29 6:54 ` David Miller
2013-05-28 16:07 ` [Patch net-next 1/3] vxlan: remove the unused rcu head from struct vxlan_rdst Stephen Hemminger
2013-05-29 6:54 ` David Miller
3 siblings, 1 reply; 7+ messages in thread
From: Cong Wang @ 2013-05-28 8:35 UTC (permalink / raw)
To: netdev; +Cc: Stephen Hemminger, David S. Miller, Cong Wang
From: Cong Wang <amwang@redhat.com>
When vxlan is compiled as builtin, its init code
runs before IPv6 init, this could cause problems
if we create IPv6 socket in the latter patch.
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
---
drivers/net/vxlan.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 6fc9620..8111565 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1771,7 +1771,7 @@ out2:
out1:
return rc;
}
-module_init(vxlan_init_module);
+late_initcall(vxlan_init_module);
static void __exit vxlan_cleanup_module(void)
{
--
1.7.7.6
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [Patch net-next 1/3] vxlan: remove the unused rcu head from struct vxlan_rdst
2013-05-28 8:35 [Patch net-next 1/3] vxlan: remove the unused rcu head from struct vxlan_rdst Cong Wang
2013-05-28 8:35 ` [Patch net-next 2/3] vxlan: use unsigned int instead of unsigned Cong Wang
2013-05-28 8:35 ` [Patch net-next 3/3] vxlan: defer vxlan init as late as possible Cong Wang
@ 2013-05-28 16:07 ` Stephen Hemminger
2013-05-29 6:54 ` David Miller
3 siblings, 0 replies; 7+ messages in thread
From: Stephen Hemminger @ 2013-05-28 16:07 UTC (permalink / raw)
To: Cong Wang; +Cc: netdev, David S. Miller
On Tue, 28 May 2013 16:35:51 +0800
Cong Wang <amwang@redhat.com> wrote:
> From: Cong Wang <amwang@redhat.com>
>
> Cc: Stephen Hemminger <stephen@networkplumber.org>
> Cc: David S. Miller <davem@davemloft.net>
> Signed-off-by: Cong Wang <amwang@redhat.com>
> ---
> drivers/net/vxlan.c | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
> index 5ed64d4..289d79a 100644
> --- a/drivers/net/vxlan.c
> +++ b/drivers/net/vxlan.c
> @@ -97,7 +97,6 @@ struct vxlan_net {
> };
>
> struct vxlan_rdst {
> - struct rcu_head rcu;
> __be32 remote_ip;
> __be16 remote_port;
> u32 remote_vni;
Correct, rdst is freed with fdb and that is already
in RCU call back
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [Patch net-next 1/3] vxlan: remove the unused rcu head from struct vxlan_rdst
2013-05-28 8:35 [Patch net-next 1/3] vxlan: remove the unused rcu head from struct vxlan_rdst Cong Wang
` (2 preceding siblings ...)
2013-05-28 16:07 ` [Patch net-next 1/3] vxlan: remove the unused rcu head from struct vxlan_rdst Stephen Hemminger
@ 2013-05-29 6:54 ` David Miller
3 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2013-05-29 6:54 UTC (permalink / raw)
To: amwang; +Cc: netdev, stephen
From: Cong Wang <amwang@redhat.com>
Date: Tue, 28 May 2013 16:35:51 +0800
> From: Cong Wang <amwang@redhat.com>
>
> Cc: Stephen Hemminger <stephen@networkplumber.org>
> Cc: David S. Miller <davem@davemloft.net>
> Signed-off-by: Cong Wang <amwang@redhat.com>
Applied.
^ permalink raw reply [flat|nested] 7+ messages in thread