Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8d1f30b authored by Changli Gao's avatar Changli Gao Committed by David S. Miller
Browse files

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: default avatarChangli Gao <xiaosuo@gmail.com>
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 592fcb9d

drivers/infiniband/core/addr.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/infiniband/hw/cxgb3/iwch_cm.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

drivers/infiniband/hw/cxgb4/cm.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {

drivers/infiniband/hw/nes/nes_cm.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/bonding/bond_main.c

+3 −3
Original line number Diff line number Diff line
@@ -2584,7 +2584,7 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave) 
		/*

		 * This target is not on a VLAN

		 */

		if (rt->u.dst.dev == bond->dev) {

		if (rt->dst.dev == bond->dev) {

			ip_rt_put(rt);

			pr_debug("basa: rtdev == bond->dev: arp_send\n");

			bond_arp_send(slave->dev, ARPOP_REQUEST, targets[i],
@@ -2595,7 +2595,7 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave) 
		vlan_id = 0;

		list_for_each_entry(vlan, &bond->vlan_list, vlan_list) {

			vlan_dev = vlan_group_get_device(bond->vlgrp, vlan->vlan_id);

			if (vlan_dev == rt->u.dst.dev) {

			if (vlan_dev == rt->dst.dev) {

				vlan_id = vlan->vlan_id;

				pr_debug("basa: vlan match on %s %d\n",

				       vlan_dev->name, vlan_id);
@@ -2613,7 +2613,7 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave) 
		if (net_ratelimit()) {

			pr_warning("%s: no path to arp_ip_target %pI4 via rt.dev %s\n",

				   bond->dev->name, &fl.fl4_dst,

				   rt->u.dst.dev ? rt->u.dst.dev->name : "NULL");

				   rt->dst.dev ? rt->dst.dev->name : "NULL");

		}

		ip_rt_put(rt);

	}