From af699c71ebae2322caae6ab9406125ca6cf59973 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Thu, 11 Apr 2013 19:00:35 +0000 Subject: [PATCH] --- yaml --- r: 369215 b: refs/heads/master c: 6706c82e39a984a02696e816cbcc8b82a21b3f67 h: refs/heads/master i: 369213: 77cf583b0553f931a0fc548ee22dcc64ecf8ddb6 369211: 63ddea03d3f781d620244ba1ab6828459cf78353 369207: 207abc420d064d8eb3b4465b53cef828708bda0f 369199: d45bf13fde5513891ace77f11cc943b1ab6c903c 369183: 5bfa7525443cd940bc8a82ec6db7865e7bd5b7cc 369151: c277d6e5a2ba76c26fc67f382f84e44055fafef8 v: v3 --- [refs] | 2 +- trunk/drivers/net/vxlan.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a92090efa7d1..e54cf1041a18 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bea893364784582d03494348a91b2c63e0d540d3 +refs/heads/master: 6706c82e39a984a02696e816cbcc8b82a21b3f67 diff --git a/trunk/drivers/net/vxlan.c b/trunk/drivers/net/vxlan.c index 9a6471593ca3..ee02ecd6ae61 100644 --- a/trunk/drivers/net/vxlan.c +++ b/trunk/drivers/net/vxlan.c @@ -403,7 +403,7 @@ static int vxlan_fdb_create(struct vxlan_dev *vxlan, return 0; } -void vxlan_fdb_free(struct rcu_head *head) +static void vxlan_fdb_free(struct rcu_head *head) { struct vxlan_fdb *f = container_of(head, struct vxlan_fdb, rcu); @@ -1108,7 +1108,7 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev) group.remote_vni = vxlan->vni; group.remote_ip = vxlan->gaddr; group.remote_ifindex = vxlan->link; - group.remote_next = 0; + group.remote_next = NULL; rdst0 = &group; if (group.remote_ip == htonl(INADDR_ANY) &&