diff options
author | Changli Gao <xiaosuo@gmail.com> | 2010-06-11 02:31:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-11 02:31:35 -0400 |
commit | d8d1f30b95a635dbd610dcc5eb641aca8f4768cf (patch) | |
tree | 71424d82a96facd5fcf05cc769ef2ba52b584aeb /net/ipv6/sit.c | |
parent | 592fcb9dfafaa02dd0edc207bf5d3a0ee7a1f8df (diff) |
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>
Diffstat (limited to 'net/ipv6/sit.c')
-rw-r--r-- | net/ipv6/sit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 702c532ec21e..4699cd3c3118 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c | |||
@@ -712,7 +712,7 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb, | |||
712 | stats->tx_carrier_errors++; | 712 | stats->tx_carrier_errors++; |
713 | goto tx_error_icmp; | 713 | goto tx_error_icmp; |
714 | } | 714 | } |
715 | tdev = rt->u.dst.dev; | 715 | tdev = rt->dst.dev; |
716 | 716 | ||
717 | if (tdev == dev) { | 717 | if (tdev == dev) { |
718 | ip_rt_put(rt); | 718 | ip_rt_put(rt); |
@@ -721,7 +721,7 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb, | |||
721 | } | 721 | } |
722 | 722 | ||
723 | if (df) { | 723 | if (df) { |
724 | mtu = dst_mtu(&rt->u.dst) - sizeof(struct iphdr); | 724 | mtu = dst_mtu(&rt->dst) - sizeof(struct iphdr); |
725 | 725 | ||
726 | if (mtu < 68) { | 726 | if (mtu < 68) { |
727 | stats->collisions++; | 727 | stats->collisions++; |
@@ -780,7 +780,7 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb, | |||
780 | memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); | 780 | memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); |
781 | IPCB(skb)->flags = 0; | 781 | IPCB(skb)->flags = 0; |
782 | skb_dst_drop(skb); | 782 | skb_dst_drop(skb); |
783 | skb_dst_set(skb, &rt->u.dst); | 783 | skb_dst_set(skb, &rt->dst); |
784 | 784 | ||
785 | /* | 785 | /* |
786 | * Push down and install the IPIP header. | 786 | * Push down and install the IPIP header. |
@@ -829,7 +829,7 @@ static void ipip6_tunnel_bind_dev(struct net_device *dev) | |||
829 | .proto = IPPROTO_IPV6 }; | 829 | .proto = IPPROTO_IPV6 }; |
830 | struct rtable *rt; | 830 | struct rtable *rt; |
831 | if (!ip_route_output_key(dev_net(dev), &rt, &fl)) { | 831 | if (!ip_route_output_key(dev_net(dev), &rt, &fl)) { |
832 | tdev = rt->u.dst.dev; | 832 | tdev = rt->dst.dev; |
833 | ip_rt_put(rt); | 833 | ip_rt_put(rt); |
834 | } | 834 | } |
835 | dev->flags |= IFF_POINTOPOINT; | 835 | dev->flags |= IFF_POINTOPOINT; |