From: Stephen Hemminger <stephen@networkplumber•org>
To: davem@davemloft•net
Cc: netdev@vger•kernel.org, Stephen Hemminger <stephen@networkplumber•org>
Subject: [PATCH net-next 10/12] vxlan: use initializer for dummy structures
Date: Mon, 10 Jun 2013 13:24:40 -0700 [thread overview]
Message-ID: <20130610132440.07cd0833@nehalam.linuxnetplumber.net> (raw)
In-Reply-To: <20130610200524.721617349@vyatta.com>
For the notification code, a couple of places build fdb entries on
the stack, use structure initialization instead and fix formatting.
Signed-off-by: Stephen Hemminger <stephen@networkplumber•org>
--- a/drivers/net/vxlan.c 2013-06-10 12:20:03.034052087 -0700
+++ b/drivers/net/vxlan.c 2013-06-10 12:20:04.266038079 -0700
@@ -311,14 +311,13 @@ errout:
static void vxlan_ip_miss(struct net_device *dev, __be32 ipa)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
- struct vxlan_fdb f;
- struct vxlan_rdst remote;
-
- memset(&f, 0, sizeof f);
- f.state = NUD_STALE;
-
- remote.remote_ip = ipa; /* goes to NDA_DST */
- remote.remote_vni = VXLAN_N_VID;
+ struct vxlan_fdb f = {
+ .state = NUD_STALE,
+ };
+ struct vxlan_rdst remote = {
+ .remote_ip = ipa, /* goes to NDA_DST */
+ .remote_vni = VXLAN_N_VID,
+ };
INIT_LIST_HEAD(&f.remotes);
list_add_rcu(&remote.list, &f.remotes);
@@ -328,11 +327,11 @@ static void vxlan_ip_miss(struct net_dev
static void vxlan_fdb_miss(struct vxlan_dev *vxlan, const u8 eth_addr[ETH_ALEN])
{
- struct vxlan_fdb f;
+ struct vxlan_fdb f = {
+ .state = NUD_STALE,
+ };
- memset(&f, 0, sizeof f);
INIT_LIST_HEAD(&f.remotes);
- f.state = NUD_STALE;
memcpy(f.eth_addr, eth_addr, ETH_ALEN);
vxlan_fdb_notify(vxlan, &f, RTM_GETNEIGH);
@@ -1501,6 +1500,7 @@ static struct vxlan_sock *vxlan_socket_c
struct sockaddr_in vxlan_addr = {
.sin_family = AF_INET,
.sin_addr.s_addr = htonl(INADDR_ANY),
+ .sin_port = port,
};
int rc;
unsigned int h;
@@ -1526,8 +1526,6 @@ static struct vxlan_sock *vxlan_socket_c
sk = vs->sock->sk;
sk_change_net(sk, net);
- vxlan_addr.sin_port = port;
-
rc = kernel_bind(vs->sock, (struct sockaddr *) &vxlan_addr,
sizeof(vxlan_addr));
if (rc < 0) {
next prev parent reply other threads:[~2013-06-10 20:25 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20130610200524.721617349@vyatta.com>
2013-06-10 20:24 ` [PATCH net-next 12/12] vxlan: bump version Stephen Hemminger
2013-06-10 20:24 ` [PATCH net-next 11/12] vxlan whitespace cleanup Stephen Hemminger
2013-06-10 20:24 ` Stephen Hemminger [this message]
2013-06-10 20:24 ` [PATCH net-next 09/12] vxlan: port module param should be ushort Stephen Hemminger
2013-06-10 20:24 ` [PATCH net-next 07/12] vxlan: make vxlan_xmit_one void Stephen Hemminger
2013-06-11 1:30 ` Cong Wang
2013-06-11 3:14 ` Stephen Hemminger
2013-06-10 20:24 ` [PATCH net-next 06/12] vxlan: move freecpu to uninit Stephen Hemminger
2013-06-10 20:24 ` [PATCH net-next 05/12] vxlan: fix race caused by dropping rtnl_unlock Stephen Hemminger
2013-06-10 20:24 ` [PATCH net-next 04/12] vxlan: send notification when MAC migrates Stephen Hemminger
2013-06-10 20:24 ` [PATCH net-next 03/12] vxlan: move IGMP join/leave to work queue Stephen Hemminger
2013-06-11 2:01 ` Cong Wang
2013-06-10 20:24 ` [PATCH net-next 02/12] vxlan: fix race between flush and incoming learning Stephen Hemminger
2013-06-11 0:46 ` Cong Wang
2013-06-11 2:00 ` Cong Wang
2013-06-10 20:24 ` [PATCH net-next 01/12] vxlan: fix crash from work pending on module removal Stephen Hemminger
2013-06-11 2:00 ` Cong Wang
2013-06-10 20:25 ` [PATCH net-next 08/12] vxlan: convert remotes list to list_rcu Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130610132440.07cd0833@nehalam.linuxnetplumber.net \
--to=stephen@networkplumber$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox