net-next: remove useless union keyword

remove useless union keyword in rtable, rt6_info and dn_route.

Since there is only one member in a union, the union keyword isn't useful.

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 6 insertions, 6 deletions

diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 0b926e45afe2..a5ea1bce9689 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -215,7 +215,7 @@ static int addr4_resolve(struct sockaddr_in *src_in,
 
         neigh = neigh_lookup(&arp_tbl, &rt->rt_gateway, rt->idev->dev);
         if (!neigh || !(neigh->nud_state & NUD_VALID)) {
-                neigh_event_send(rt->u.dst.neighbour, NULL);
+                neigh_event_send(rt->dst.neighbour, NULL);
                 ret = -ENODATA;
                 if (neigh)
                         goto release;
diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index ebfb117ba68b..abd683ea326d 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -1364,7 +1364,7 @@ static int pass_accept_req(struct t3cdev *tdev, struct sk_buff *skb, void *ctx)
                        __func__);
                 goto reject;
         }
-        dst = &rt->u.dst;
+        dst = &rt->dst;
         l2t = t3_l2t_get(tdev, dst->neighbour, dst->neighbour->dev);
         if (!l2t) {
                 printk(KERN_ERR MOD "%s - failed to allocate l2t entry!\n",
@@ -1932,7 +1932,7 @@ int iwch_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
                 err = -EHOSTUNREACH;
                 goto fail3;
         }
-        ep->dst = &rt->u.dst;
+        ep->dst = &rt->dst;
 
         /* get a l2t entry */
         ep->l2t = t3_l2t_get(ep->com.tdev, ep->dst->neighbour,
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index 30ce0a8eca09..8b693c8c25e2 100644
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -1364,7 +1364,7 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb)
                        __func__);
                 goto reject;
         }
-        dst = &rt->u.dst;
+        dst = &rt->dst;
         if (dst->neighbour->dev->flags & IFF_LOOPBACK) {
                 pdev = ip_dev_find(&init_net, peer_ip);
                 BUG_ON(!pdev);
@@ -1938,7 +1938,7 @@ int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
                 err = -EHOSTUNREACH;
                 goto fail3;
         }
-        ep->dst = &rt->u.dst;
+        ep->dst = &rt->dst;
 
         /* get a l2t entry */
         if (ep->dst->neighbour->dev->flags & IFF_LOOPBACK) {
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 986d6f32dded..d876d0435cd4 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -1146,7 +1146,7 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi
         }
 
         if ((neigh == NULL) || (!(neigh->nud_state & NUD_VALID)))
-                neigh_event_send(rt->u.dst.neighbour, NULL);
+                neigh_event_send(rt->dst.neighbour, NULL);
 
         ip_rt_put(rt);
         return rc;