net-next: remove useless union keyword
Subsystems (15)
PATCH v3 1/1 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.
----
drivers/infiniband/core/addr.c | 2 drivers/infiniband/hw/cxgb3/iwch_cm.c | 4 drivers/infiniband/hw/nes/nes_cm.c | 2 drivers/net/bonding/bond_main.c | 6 drivers/net/cnic.c | 2 drivers/scsi/cxgb3i/cxgb3i_offload.c | 4 include/net/dn_route.h | 4 include/net/ip6_fib.h | 10 include/net/ipip.h | 2 include/net/route.h | 6 net/atm/clip.c | 2 net/bridge/br_device.c | 2 net/bridge/br_netfilter.c | 20 - net/dccp/ipv4.c | 4 net/decnet/dn_route.c | 158 ++++++------ net/ethernet/eth.c | 5 net/ipv4/af_inet.c | 4 net/ipv4/arp.c | 12 net/ipv4/datagram.c | 2 net/ipv4/icmp.c | 18 - net/ipv4/igmp.c | 10 net/ipv4/inet_connection_sock.c | 2 net/ipv4/ip_forward.c | 10 net/ipv4/ip_gre.c | 14 - net/ipv4/ip_input.c | 4 net/ipv4/ip_options.c | 2 net/ipv4/ip_output.c | 60 ++-- net/ipv4/ipip.c | 8 net/ipv4/ipmr.c | 8 net/ipv4/netfilter.c | 8 net/ipv4/raw.c | 16 - net/ipv4/route.c | 416 ++++++++++++++++---------------- net/ipv4/syncookies.c | 6 net/ipv4/tcp_ipv4.c | 2 net/ipv4/udp.c | 4 net/ipv4/xfrm4_policy.c | 2 net/ipv6/addrconf.c | 10 net/ipv6/anycast.c | 6 net/ipv6/fib6_rules.c | 10 net/ipv6/ip6_fib.c | 30 +- net/ipv6/ip6_output.c | 38 +- net/ipv6/ip6_tunnel.c | 8 net/ipv6/mcast.c | 4 net/ipv6/ndisc.c | 8 net/ipv6/raw.c | 12 net/ipv6/route.c | 300 +++++++++++------------ net/ipv6/sit.c | 8 net/l2tp/l2tp_ip.c | 6 net/netfilter/ipvs/ip_vs_xmit.c | 86 +++--- net/netfilter/nf_conntrack_h323_main.c | 12 net/netfilter/nf_conntrack_netbios_ns.c | 2 net/netfilter/xt_TCPMSS.c | 4 net/netfilter/xt_TEE.c | 4 net/rxrpc/ar-peer.c | 4 net/sctp/protocol.c | 4 55 files changed, 691 insertions(+), 706 deletions(-)
drivers/infiniband/core/addr.c +1 -1
@@ -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
@@ -1388,7 +1388,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",
@@ -1956,7 +1956,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/nes/nes_cm.c +1 -1
@@ -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
@@ -2555,7 +2555,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],
@@ -2566,7 +2566,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);
@@ -2584,7 +2584,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); }
drivers/net/cnic.c +1 -1
@@ -2785,7 +2785,7 @@ static int cnic_get_v4_route(struct sockaddr_in *dst_addr, err =ip_route_output_key (&init_net, &rt, &fl);if (!err) - *dst = &rt->u.dst; + *dst = &rt->dst;return err;#else return -ENETUNREACH ;
drivers/scsi/cxgb3i/cxgb3i_offload.c +2 -2
@@ -1587,7 +1587,7 @@ cxgb3i_find_dev(struct net_device *dev, __be32 ipaddr) err =ip_route_output_key (dev ?dev_net (dev) : &init_net, &rt, &fl);if (!err) -return (&rt->u.dst)->dev; +return (&rt->dst)->dev;return NULL ; }
@@ -1649,7 +1649,7 @@ int cxgb3i_c3cn_connect(struct net_device *dev, struct s3_conn *c3cn, c3cn->saddr.sin_addr.s_addr = rt->rt_src;/* now commit destination to connection */ - c3cn->dst_cache = &rt->u.dst; + c3cn->dst_cache = &rt->dst;/* try to establish an offloaded connection */ dev =cxgb3_egress_dev (c3cn->dst_cache->dev, c3cn,0 );
include/net/dn_route.h +1 -3
@@ -65,9 +65,7 @@ extern void dn_rt_cache_flush(int delay);* packets to the originating host. */ struct dn_route { -union { -struct dst_entry dst; - } u; +struct dst_entry dst;struct flowi fl;
include/net/ip6_fib.h +4 -6
@@ -84,13 +84,11 @@ struct rt6key {struct fib6_table ;struct rt6_info { -union { -struct dst_entry dst; - } u; +struct dst_entry dst; -#define rt6i_dev u.dst.dev -#define rt6i_nexthop u.dst.neighbour -#define rt6i_expires u.dst.expires +#define rt6i_dev dst.dev +#define rt6i_nexthop dst.neighbour +#define rt6i_expires dst.expires/* * Tail elements of dst_entry (__refcnt etc.)
include/net/ipip.h +1 -1
@@ -50,7 +50,7 @@ struct ip_tunnel_prl_entry {int pkt_len = skb->len -skb_transport_offset (skb); \ \ skb->ip_summed =CHECKSUM_NONE ; \ -ip_select_ident (iph, &rt->u.dst,NULL ); \ +ip_select_ident (iph, &rt->dst,NULL ); \ \ err =ip_local_out (skb); \if (likely (net_xmit_eval (err) ==0 )) { \
include/net/route.h +2 -4
@@ -50,9 +50,7 @@struct fib_nh ;struct inet_peer ;struct rtable { -union { -struct dst_entry dst; - } u; +struct dst_entry dst;/* Cache lookup keys */ struct flowi fl;
@@ -129,7 +127,7 @@ extern void fib_add_ifaddr(struct in_ifaddr *);static inline void ip_rt_put (struct rtable * rt) {if (rt) -dst_release (&rt->u.dst); +dst_release (&rt->dst); }#define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3)
net/atm/clip.c +1 -1
@@ -522,7 +522,7 @@ static int clip_setentry(struct atm_vcc *vcc, __be32 ip) error =ip_route_output_key (&init_net, &rt, &fl);if (error)return error; - neigh =__neigh_lookup (&clip_tbl, &ip, rt->u.dst.dev,1 ); + neigh =__neigh_lookup (&clip_tbl, &ip, rt->dst.dev,1 );ip_rt_put (rt);if (!neigh)return -ENOMEM ;
net/bridge/br_device.c +1 -1
@@ -127,7 +127,7 @@ static int br_change_mtu(struct net_device *dev, int new_mtu)#ifdef CONFIG_BRIDGE_NETFILTER /* remember the MTU in the rtable for PMTU */ - br->fake_rtable.u.dst.metrics[RTAX_MTU -1 ] = new_mtu; + br->fake_rtable.dst.metrics[RTAX_MTU -1 ] = new_mtu;#endif return 0 ;
net/bridge/br_netfilter.c +10 -10
@@ -117,12 +117,12 @@ void br_netfilter_rtable_init(struct net_bridge *br) {struct rtable *rt = &br->fake_rtable; -atomic_set (&rt->u.dst.__refcnt,1 ); - rt->u.dst.dev = br->dev; - rt->u.dst.path = &rt->u.dst; - rt->u.dst.metrics[RTAX_MTU -1 ] =1500 ; - rt->u.dst.flags =DST_NOXFRM ; - rt->u.dst.ops = &fake_dst_ops; +atomic_set (&rt->dst.__refcnt,1 ); + rt->dst.dev = br->dev; + rt->dst.path = &rt->dst; + rt->dst.metrics[RTAX_MTU -1 ] =1500 ; + rt->dst.flags =DST_NOXFRM ; + rt->dst.ops = &fake_dst_ops; }static inline struct rtable *bridge_parent_rtable (const struct net_device *dev)
@@ -244,8 +244,8 @@ static int br_nf_pre_routing_finish_ipv6(struct sk_buff *skb)kfree_skb (skb);return 0 ; } -dst_hold (&rt->u.dst); -skb_dst_set (skb, &rt->u.dst); +dst_hold (&rt->dst); +skb_dst_set (skb, &rt->dst); skb->dev = nf_bridge->physindev;nf_bridge_update_protocol (skb);
@@ -396,8 +396,8 @@ bridged_dnat:kfree_skb (skb);return 0 ; } -dst_hold (&rt->u.dst); -skb_dst_set (skb, &rt->u.dst); +dst_hold (&rt->dst); +skb_dst_set (skb, &rt->dst); } skb->dev = nf_bridge->physindev;
net/dccp/ipv4.c +2 -2
@@ -105,7 +105,7 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) goto failure;/* OK, now commit destination to socket. */ -sk_setup_caps (sk, &rt->u.dst); +sk_setup_caps (sk, &rt->dst); dp->dccps_iss = secure_dccp_sequence_number(inet->inet_saddr, inet->inet_daddr,
@@ -475,7 +475,7 @@ static struct dst_entry* dccp_v4_route_skb(struct net *net, struct sock *sk,return NULL ; } -return &rt->u.dst; +return &rt->dst; } static int dccp_v4_send_response(struct sock *sk, struct request_sock *req,
net/decnet/dn_route.c +79 -79
363 lines not on this page · raw message
net/ethernet/eth.c +1 -4
@@ -158,7 +158,6 @@ EXPORT_SYMBOL(eth_rebuild_header);__be16 eth_type_trans (struct sk_buff *skb,struct net_device *dev) {struct ethhdr *eth; -unsigned char *rawp; skb->dev = dev;skb_reset_mac_header (skb);
@@ -199,15 +198,13 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)if (ntohs (eth->h_proto) >=1536 )return eth->h_proto; - rawp = skb->data; -/* * This is a magic hack to spot IPX packets. Older Novell breaks * the protocol design and runs IPX over 802.3 without an 802.2 LLC * layer. We look for FFFF which isn't a used 802.2 SSAP/DSAP. This * won't work for fault tolerant netware but does for the rest. */ -if (*(unsigned short *)rawp ==0xFFFF ) +if (skb->len >=2 && *(unsigned short *)(skb->data) ==0xFFFF )return htons (ETH_P_802_3 );/*
net/ipv4/af_inet.c +2 -2
@@ -1100,7 +1100,7 @@ static int inet_sk_reselect_saddr(struct sock *sk)if (err)return err; -sk_setup_caps (sk, &rt->u.dst); +sk_setup_caps (sk, &rt->dst); new_saddr = rt->rt_src;
@@ -1166,7 +1166,7 @@ int inet_sk_rebuild_header(struct sock *sk) err =ip_route_output_flow (sock_net (sk), &rt, &fl, sk,0 ); }if (!err) -sk_setup_caps (sk, &rt->u.dst); +sk_setup_caps (sk, &rt->dst);else {/* Routing failed... */ sk->sk_route_caps =0 ;
net/ipv4/arp.c +6 -6
@@ -427,7 +427,7 @@ static int arp_filter(__be32 sip, __be32 tip, struct net_device *dev)if (ip_route_output_key (net, &rt, &fl) <0 )return 1 ; -if (rt->u.dst.dev != dev) { +if (rt->dst.dev != dev) {NET_INC_STATS_BH (net,LINUX_MIB_ARPFILTER ); flag =1 ; }
@@ -532,7 +532,7 @@ static inline int arp_fwd_proxy(struct in_device *in_dev,struct in_device *out_dev;int imi, omi =-1 ; -if (rt->u.dst.dev == dev) +if (rt->dst.dev == dev)return 0 ;if (!IN_DEV_PROXY_ARP (in_dev))
@@ -545,7 +545,7 @@ static inline int arp_fwd_proxy(struct in_device *in_dev,/* place to check for proxy_arp for routes */ -if ((out_dev =in_dev_get (rt->u.dst.dev)) !=NULL ) { +if ((out_dev =in_dev_get (rt->dst.dev)) !=NULL ) { omi =IN_DEV_MEDIUM_ID (out_dev);in_dev_put (out_dev); }
@@ -576,7 +576,7 @@ static inline int arp_fwd_pvlan(struct in_device *in_dev, __be32 sip, __be32 tip) {/* Private VLAN is only concerned about the same ethernet segment */ -if (rt->u.dst.dev != dev) +if (rt->dst.dev != dev)return 0 ;/* Don't reply on self probes (often done by windowz boxes)*/
@@ -1045,7 +1045,7 @@ static int arp_req_set(struct net *net, struct arpreq *r,struct rtable * rt;if ((err =ip_route_output_key (net, &rt, &fl)) !=0 )return err; - dev = rt->u.dst.dev; + dev = rt->dst.dev;ip_rt_put (rt);if (!dev)return -EINVAL ;
@@ -1152,7 +1152,7 @@ static int arp_req_delete(struct net *net, struct arpreq *r,struct rtable * rt;if ((err =ip_route_output_key (net, &rt, &fl)) !=0 )return err; - dev = rt->u.dst.dev; + dev = rt->dst.dev;ip_rt_put (rt);if (!dev)return -EINVAL ;
net/ipv4/datagram.c +1 -1
@@ -69,7 +69,7 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) sk->sk_state =TCP_ESTABLISHED ; inet->inet_id = jiffies; -sk_dst_set (sk, &rt->u.dst); +sk_dst_set (sk, &rt->dst);return (0 ); }
net/ipv4/icmp.c +9 -9
@@ -271,7 +271,7 @@ int xrlim_allow(struct dst_entry *dst, int timeout)static inline int icmpv4_xrlim_allow (struct net *net,struct rtable *rt,int type,int code) { -struct dst_entry *dst = &rt->u.dst; +struct dst_entry *dst = &rt->dst;int rc =1 ;if (type >NR_ICMP_TYPES )
@@ -327,7 +327,7 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param,struct sock *sk;struct sk_buff *skb; - sk =icmp_sk (dev_net ((*rt)->u.dst.dev)); + sk =icmp_sk (dev_net ((*rt)->dst.dev)); if (ip_append_data(sk, icmp_glue_bits, icmp_param, icmp_param->data_len+icmp_param->head_len, icmp_param->head_len,
@@ -359,7 +359,7 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb) {struct ipcm_cookie ipc;struct rtable *rt =skb_rtable (skb); -struct net *net =dev_net (rt->u.dst.dev); +struct net *net =dev_net (rt->dst.dev);struct sock *sk;struct inet_sock *inet;__be32 daddr;
@@ -427,7 +427,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)if (!rt) goto out; - net =dev_net (rt->u.dst.dev); + net =dev_net (rt->dst.dev);/* * Find the original header. It is expected to be valid, of course.
@@ -596,9 +596,9 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)/* Ugh! */ odst =skb_dst (skb_in); err =ip_route_input (skb_in, fl.fl4_dst, fl.fl4_src, -RT_TOS (tos), rt2->u.dst.dev); +RT_TOS (tos), rt2->dst.dev); -dst_release (&rt2->u.dst); +dst_release (&rt2->dst); rt2 =skb_rtable (skb_in);skb_dst_set (skb_in, odst); }
@@ -610,7 +610,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) XFRM_LOOKUP_ICMP);switch (err) {case 0 : -dst_release (&rt->u.dst); +dst_release (&rt->dst); rt = rt2;break ;case -EPERM :
@@ -629,7 +629,7 @@ route_done:/* RFC says return as much as we can without exceeding 576 bytes. */ - room =dst_mtu (&rt->u.dst); + room =dst_mtu (&rt->dst);if (room >576 ) room =576 ; room -=sizeof (struct iphdr ) + icmp_param.replyopts.optlen;
@@ -974,7 +974,7 @@ int icmp_rcv(struct sk_buff *skb) {struct icmphdr *icmph;struct rtable *rt =skb_rtable (skb); -struct net *net =dev_net (rt->u.dst.dev); +struct net *net =dev_net (rt->dst.dev);if (!xfrm4_policy_check (NULL ,XFRM_POLICY_IN , skb)) {struct sec_path *sp =skb_sec_path (skb);
net/ipv4/igmp.c +5 -5
@@ -312,7 +312,7 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size)return NULL ; } -skb_dst_set (skb, &rt->u.dst); +skb_dst_set (skb, &rt->dst); skb->dev = dev;skb_reserve (skb,LL_RESERVED_SPACE (dev));
@@ -330,7 +330,7 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size) pip->saddr = rt->rt_src; pip->protocol =IPPROTO_IGMP ; pip->tot_len =0 ;/* filled in later */ -ip_select_ident (pip, &rt->u.dst,NULL ); +ip_select_ident (pip, &rt->dst,NULL ); ((u8 *)&pip[1 ])[0 ] =IPOPT_RA ; ((u8 *)&pip[1 ])[1 ] =4 ; ((u8 *)&pip[1 ])[2 ] =0 ;
@@ -660,7 +660,7 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc,return -1 ; } -skb_dst_set (skb, &rt->u.dst); +skb_dst_set (skb, &rt->dst);skb_reserve (skb,LL_RESERVED_SPACE (dev));
@@ -676,7 +676,7 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc, iph->daddr = dst; iph->saddr = rt->rt_src; iph->protocol =IPPROTO_IGMP ; -ip_select_ident (iph, &rt->u.dst,NULL ); +ip_select_ident (iph, &rt->dst,NULL ); ((u8 *)&iph[1 ])[0 ] =IPOPT_RA ; ((u8 *)&iph[1 ])[1 ] =4 ; ((u8 *)&iph[1 ])[2 ] =0 ;
@@ -1427,7 +1427,7 @@ static struct in_device *ip_mc_find_dev(struct net *net, struct ip_mreqn *imr) }if (!dev && !ip_route_output_key (net, &rt, &fl)) { - dev = rt->u.dst.dev; + dev = rt->dst.dev;ip_rt_put (rt); }if (dev) {
net/ipv4/inet_connection_sock.c +1 -1
@@ -383,7 +383,7 @@ struct dst_entry *inet_csk_route_req(struct sock *sk, goto no_route;if (opt && opt->is_strictroute && rt->rt_dst != rt->rt_gateway) goto route_err; -return &rt->u.dst; +return &rt->dst; route_err:ip_rt_put (rt);
net/ipv4/ip_forward.c +5 -5
@@ -87,16 +87,16 @@ int ip_forward(struct sk_buff *skb)if (opt->is_strictroute && rt->rt_dst != rt->rt_gateway) goto sr_failed; -if (unlikely (skb->len >dst_mtu (&rt->u.dst) && !skb_is_gso (skb) && +if (unlikely (skb->len >dst_mtu (&rt->dst) && !skb_is_gso (skb) && (ip_hdr (skb)->frag_off &htons (IP_DF ))) && !skb->local_df) { -IP_INC_STATS (dev_net (rt->u.dst.dev),IPSTATS_MIB_FRAGFAILS ); +IP_INC_STATS (dev_net (rt->dst.dev),IPSTATS_MIB_FRAGFAILS );icmp_send (skb,ICMP_DEST_UNREACH ,ICMP_FRAG_NEEDED , -htonl (dst_mtu (&rt->u.dst))); +htonl (dst_mtu (&rt->dst))); goto drop; }/* We are about to mangle packet. Copy it! */ -if (skb_cow (skb,LL_RESERVED_SPACE (rt->u.dst.dev)+rt->u.dst.header_len)) +if (skb_cow (skb,LL_RESERVED_SPACE (rt->dst.dev)+rt->dst.header_len)) goto drop; iph =ip_hdr (skb);
@@ -113,7 +113,7 @@ int ip_forward(struct sk_buff *skb) skb->priority =rt_tos2priority (iph->tos);return NF_HOOK (NFPROTO_IPV4 ,NF_INET_FORWARD , skb, skb->dev, - rt->u.dst.dev, ip_forward_finish); + rt->dst.dev, ip_forward_finish); sr_failed:/*
net/ipv4/ip_gre.c +7 -7
@@ -753,7 +753,7 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev goto tx_error; } } - tdev = rt->u.dst.dev; + tdev = rt->dst.dev;if (tdev == dev) {ip_rt_put (rt);
@@ -763,7 +763,7 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev df = tiph->frag_off;if (df) - mtu =dst_mtu (&rt->u.dst) - dev->hard_header_len - tunnel->hlen; + mtu =dst_mtu (&rt->dst) - dev->hard_header_len - tunnel->hlen;else mtu =skb_dst (skb) ?dst_mtu (skb_dst (skb)) : dev->mtu;
@@ -811,7 +811,7 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev tunnel->err_count =0 ; } - max_headroom =LL_RESERVED_SPACE (tdev) + gre_hlen + rt->u.dst.header_len; + max_headroom =LL_RESERVED_SPACE (tdev) + gre_hlen + rt->dst.header_len;if (skb_headroom (skb) < max_headroom ||skb_shared (skb)|| (skb_cloned (skb) && !skb_clone_writable (skb,0 ))) {
@@ -838,7 +838,7 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *devIPCB (skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE |IPSKB_XFRM_TRANSFORMED |IPSKB_REROUTED );skb_dst_drop (skb); -skb_dst_set (skb, &rt->u.dst); +skb_dst_set (skb, &rt->dst);/* * Push down and install the IPIP header.
@@ -861,7 +861,7 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev iph->ttl = ((struct ipv6hdr *)old_iph)->hop_limit;#endif else - iph->ttl = dst_metric(&rt->u.dst, RTAX_HOPLIMIT); + iph->ttl = dst_metric(&rt->dst, RTAX_HOPLIMIT); } ((__be16 *)(iph +1 ))[0 ] = tunnel->parms.o_flags;
@@ -923,7 +923,7 @@ static int ipgre_tunnel_bind_dev(struct net_device *dev) .proto = IPPROTO_GRE };struct rtable *rt;if (!ip_route_output_key (dev_net (dev), &rt, &fl)) { - tdev = rt->u.dst.dev; + tdev = rt->dst.dev;ip_rt_put (rt); }
@@ -1182,7 +1182,7 @@ static int ipgre_open(struct net_device *dev)struct rtable *rt;if (ip_route_output_key (dev_net (dev), &rt, &fl))return -EADDRNOTAVAIL ; - dev = rt->u.dst.dev; + dev = rt->dst.dev;ip_rt_put (rt);if (__in_dev_get_rtnl (dev) ==NULL )return -EADDRNOTAVAIL ;
net/ipv4/ip_input.c +2 -2
@@ -360,10 +360,10 @@ static int ip_rcv_finish(struct sk_buff *skb) rt =skb_rtable (skb);if (rt->rt_type ==RTN_MULTICAST ) { -IP_UPD_PO_STATS_BH (dev_net (rt->u.dst.dev),IPSTATS_MIB_INMCAST , +IP_UPD_PO_STATS_BH (dev_net (rt->dst.dev),IPSTATS_MIB_INMCAST , skb->len); }else if (rt->rt_type ==RTN_BROADCAST ) -IP_UPD_PO_STATS_BH (dev_net (rt->u.dst.dev),IPSTATS_MIB_INBCAST , +IP_UPD_PO_STATS_BH (dev_net (rt->dst.dev),IPSTATS_MIB_INBCAST , skb->len);return dst_input (skb);
net/ipv4/ip_options.c +1 -1
@@ -630,7 +630,7 @@ int ip_options_rcv_srr(struct sk_buff *skb) rt2 =skb_rtable (skb);if (err || (rt2->rt_type !=RTN_UNICAST && rt2->rt_type !=RTN_LOCAL )) {ip_rt_put (rt2); -skb_dst_set (skb, &rt->u.dst); +skb_dst_set (skb, &rt->dst);return -EINVAL ; }ip_rt_put (rt);
net/ipv4/ip_output.c +30 -30
201 lines not on this page · raw message
net/ipv4/ipip.c +4 -4
@@ -438,7 +438,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) goto tx_error_icmp; } } - tdev = rt->u.dst.dev; + tdev = rt->dst.dev;if (tdev == dev) {ip_rt_put (rt);
@@ -449,7 +449,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) df |= old_iph->frag_off &htons (IP_DF );if (df) { - mtu =dst_mtu (&rt->u.dst) -sizeof (struct iphdr ); + mtu =dst_mtu (&rt->dst) -sizeof (struct iphdr );if (mtu <68 ) { stats->collisions++;
@@ -506,7 +506,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)IPCB (skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE |IPSKB_XFRM_TRANSFORMED |IPSKB_REROUTED );skb_dst_drop (skb); -skb_dst_set (skb, &rt->u.dst); +skb_dst_set (skb, &rt->dst);/* * Push down and install the IPIP header.
@@ -555,7 +555,7 @@ static void ipip_tunnel_bind_dev(struct net_device *dev) .proto = IPPROTO_IPIP };struct rtable *rt;if (!ip_route_output_key (dev_net (dev), &rt, &fl)) { - tdev = rt->u.dst.dev; + tdev = rt->dst.dev;ip_rt_put (rt); } dev->flags |=IFF_POINTOPOINT ;
net/ipv4/ipmr.c +4 -4
@@ -1551,9 +1551,9 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt, goto out_free; } - dev = rt->u.dst.dev; + dev = rt->dst.dev; -if (skb->len+encap >dst_mtu (&rt->u.dst) && (ntohs (iph->frag_off) &IP_DF )) { +if (skb->len+encap >dst_mtu (&rt->dst) && (ntohs (iph->frag_off) &IP_DF )) {/* Do not fragment multicasts. Alas, IPv4 does not allow to send ICMP, so that packets will disappear to blackhole.
@@ -1564,7 +1564,7 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt, goto out_free; } - encap +=LL_RESERVED_SPACE (dev) + rt->u.dst.header_len; + encap +=LL_RESERVED_SPACE (dev) + rt->dst.header_len;if (skb_cow (skb, encap)) {ip_rt_put (rt);
@@ -1575,7 +1575,7 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt, vif->bytes_out += skb->len;skb_dst_drop (skb); -skb_dst_set (skb, &rt->u.dst); +skb_dst_set (skb, &rt->dst);ip_decrease_ttl (ip_hdr (skb));/* FIXME: forward and output firewalls used to be called here.
net/ipv4/netfilter.c +4 -4
@@ -43,7 +43,7 @@ int ip_route_me_harder(struct sk_buff *skb, unsigned addr_type)/* Drop old route. */ skb_dst_drop (skb); -skb_dst_set (skb, &rt->u.dst); +skb_dst_set (skb, &rt->dst); }else {/* non-local src, find valid iif to satisfy * rp-filter when calling ip_route_input. */
@@ -53,11 +53,11 @@ int ip_route_me_harder(struct sk_buff *skb, unsigned addr_type) odst =skb_dst (skb);if (ip_route_input (skb, iph->daddr, iph->saddr, -RT_TOS (iph->tos), rt->u.dst.dev) !=0 ) { -dst_release (&rt->u.dst); +RT_TOS (iph->tos), rt->dst.dev) !=0 ) { +dst_release (&rt->dst);return -1 ; } -dst_release (&rt->u.dst); +dst_release (&rt->dst);dst_release (odst); }
net/ipv4/raw.c +8 -8
@@ -324,24 +324,24 @@ static int raw_send_hdrinc(struct sock *sk, void *from, size_t length,unsigned int iphlen;int err; -if (length > rt->u.dst.dev->mtu) { +if (length > rt->dst.dev->mtu) {ip_local_error (sk,EMSGSIZE , rt->rt_dst, inet->inet_dport, - rt->u.dst.dev->mtu); + rt->dst.dev->mtu);return -EMSGSIZE ; }if (flags&MSG_PROBE ) goto out; skb =sock_alloc_send_skb (sk, - length +LL_ALLOCATED_SPACE (rt->u.dst.dev) +15 , + length +LL_ALLOCATED_SPACE (rt->dst.dev) +15 , flags &MSG_DONTWAIT , &err);if (skb ==NULL ) goto error; -skb_reserve (skb,LL_RESERVED_SPACE (rt->u.dst.dev)); +skb_reserve (skb,LL_RESERVED_SPACE (rt->dst.dev)); skb->priority = sk->sk_priority; skb->mark = sk->sk_mark; -skb_dst_set (skb,dst_clone (&rt->u.dst)); +skb_dst_set (skb,dst_clone (&rt->dst));skb_reset_network_header (skb); iph =ip_hdr (skb);
@@ -373,7 +373,7 @@ static int raw_send_hdrinc(struct sock *sk, void *from, size_t length, iph->check =0 ; iph->tot_len =htons (length);if (!iph->id) -ip_select_ident (iph, &rt->u.dst,NULL ); +ip_select_ident (iph, &rt->dst,NULL ); iph->check =ip_fast_csum ((unsigned char *)iph, iph->ihl); }
@@ -382,7 +382,7 @@ static int raw_send_hdrinc(struct sock *sk, void *from, size_t length, skb_transport_header(skb))->type); err =NF_HOOK (NFPROTO_IPV4 ,NF_INET_LOCAL_OUT , skb,NULL , - rt->u.dst.dev, dst_output); + rt->dst.dev, dst_output);if (err >0 ) err =net_xmit_errno (err);if (err)
@@ -604,7 +604,7 @@ out:return len; do_confirm: -dst_confirm (&rt->u.dst); +dst_confirm (&rt->dst);if (!(msg->msg_flags &MSG_PROBE ) || len) goto back_from_confirm; err =0 ;
net/ipv4/route.c +208 -208
993 lines not on this page · raw message
net/ipv4/syncookies.c +3 -3
@@ -354,15 +354,15 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb, }/* Try to redo what tcp_v4_send_synack did. */ - req->window_clamp = tp->window_clamp ? :dst_metric (&rt->u.dst,RTAX_WINDOW ); + req->window_clamp = tp->window_clamp ? :dst_metric (&rt->dst,RTAX_WINDOW );tcp_select_initial_window (tcp_full_space (sk), req->mss, &req->rcv_wnd, &req->window_clamp, ireq->wscale_ok, &rcv_wscale, -dst_metric (&rt->u.dst,RTAX_INITRWND )); +dst_metric (&rt->dst,RTAX_INITRWND )); ireq->rcv_wscale = rcv_wscale; - ret =get_cookie_sock (sk, skb, req, &rt->u.dst); + ret =get_cookie_sock (sk, skb, req, &rt->dst); out:return ret; }
net/ipv4/tcp_ipv4.c +1 -1
@@ -237,7 +237,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)/* OK, now commit destination to socket. */ sk->sk_gso_type =SKB_GSO_TCPV4 ; -sk_setup_caps (sk, &rt->u.dst); +sk_setup_caps (sk, &rt->dst);if (!tp->write_seq) tp->write_seq = secure_tcp_sequence_number(inet->inet_saddr,
net/ipv4/udp.c +2 -2
@@ -914,7 +914,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, !sock_flag(sk, SOCK_BROADCAST)) goto out;if (connected) -sk_dst_set (sk,dst_clone (&rt->u.dst)); +sk_dst_set (sk,dst_clone (&rt->dst)); }if (msg->msg_flags&MSG_CONFIRM )
@@ -978,7 +978,7 @@ out:return err; do_confirm: -dst_confirm (&rt->u.dst); +dst_confirm (&rt->dst);if (!(msg->msg_flags&MSG_PROBE ) || len) goto back_from_confirm; err =0 ;
net/ipv4/xfrm4_policy.c +1 -1
@@ -37,7 +37,7 @@ static struct dst_entry *xfrm4_dst_lookup(struct net *net, int tos, fl.fl4_src = saddr->a4; err =__ip_route_output_key (net, &rt, &fl); - dst = &rt->u.dst; + dst = &rt->dst;if (err) dst =ERR_PTR (err);return dst;
net/ipv6/addrconf.c +5 -5
@@ -557,7 +557,7 @@ void inet6_ifa_finish_destroy(struct inet6_ifaddr *ifp)pr_warning ("Freeing alive inet6 address %p\n" , ifp);return ; } -dst_release (&ifp->rt->u.dst); +dst_release (&ifp->rt->dst);call_rcu (&ifp->rcu, inet6_ifa_finish_destroy_rcu); }
@@ -815,7 +815,7 @@ static void ipv6_del_addr(struct inet6_ifaddr *ifp) rt->rt6i_flags |=RTF_EXPIRES ; } } -dst_release (&rt->u.dst); +dst_release (&rt->dst); }in6_ifa_put (ifp);
@@ -1836,7 +1836,7 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len) dev, expires, flags); }if (rt) -dst_release (&rt->u.dst); +dst_release (&rt->dst); }/* Try to figure out our local address for this prefix */
@@ -4047,10 +4047,10 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)if (ifp->idev->cnf.forwarding)addrconf_leave_anycast (ifp);addrconf_leave_solict (ifp->idev, &ifp->addr); -dst_hold (&ifp->rt->u.dst); +dst_hold (&ifp->rt->dst);if (ifp->dead &&ip6_del_rt (ifp->rt)) -dst_free (&ifp->rt->u.dst); +dst_free (&ifp->rt->dst);break ; } }
net/ipv6/anycast.c +3 -3
@@ -84,7 +84,7 @@ int ipv6_sock_ac_join(struct sock *sk, int ifindex, struct in6_addr *addr)if (rt) { dev = rt->rt6i_dev;dev_hold (dev); -dst_release (&rt->u.dst); +dst_release (&rt->dst); }else if (ishost) { err = -EADDRNOTAVAIL ; goto out_free_pac;
@@ -250,7 +250,7 @@ static void aca_put(struct ifacaddr6 *ac) {if (atomic_dec_and_test (&ac->aca_refcnt)) {in6_dev_put (ac->aca_idev); -dst_release (&ac->aca_rt->u.dst); +dst_release (&ac->aca_rt->dst);kfree (ac); } }
@@ -356,7 +356,7 @@ int __ipv6_dev_ac_dec(struct inet6_dev *idev, struct in6_addr *addr)write_unlock_bh (&idev->lock);addrconf_leave_solict (idev, &aca->aca_addr); -dst_hold (&aca->aca_rt->u.dst); +dst_hold (&aca->aca_rt->dst);ip6_del_rt (aca->aca_rt);aca_put (aca);
net/ipv6/fib6_rules.c +5 -5
@@ -43,8 +43,8 @@ struct dst_entry *fib6_rule_lookup(struct net *net, struct flowi *fl,if (arg.result)return arg.result; -dst_hold (&net->ipv6.ip6_null_entry->u.dst); -return &net->ipv6.ip6_null_entry->u.dst; +dst_hold (&net->ipv6.ip6_null_entry->dst); +return &net->ipv6.ip6_null_entry->dst; } static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp,
@@ -86,7 +86,7 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp,struct in6_addr saddr;if (ipv6_dev_get_saddr (net, -ip6_dst_idev (&rt->u.dst)->dev, +ip6_dst_idev (&rt->dst)->dev, &flp->fl6_dst,rt6_flags2srcprefs (flags), &saddr))
@@ -99,12 +99,12 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp, goto out; } again: -dst_release (&rt->u.dst); +dst_release (&rt->dst); rt =NULL ; goto out; discard_pkt: -dst_hold (&rt->u.dst); +dst_hold (&rt->dst); out: arg->result = rt;return rt ==NULL ? -EAGAIN :0 ;
net/ipv6/ip6_fib.c +15 -15
@@ -165,7 +165,7 @@ static __inline__ void node_free(struct fib6_node * fn)static __inline__void rt6_release (struct rt6_info *rt) {if (atomic_dec_and_test (&rt->rt6i_ref)) -dst_free (&rt->u.dst); +dst_free (&rt->dst); }static void fib6_link_table (struct net *net,struct fib6_table *tb)
@@ -278,7 +278,7 @@ static int fib6_dump_node(struct fib6_walker_t *w)int res;struct rt6_info *rt; -for (rt = w->leaf; rt; rt = rt->u.dst.rt6_next) { +for (rt = w->leaf; rt; rt = rt->dst.rt6_next) { res =rt6_dump_route (rt, w->args);if (res <0 ) {/* Frame is full, suspend walking */
@@ -619,7 +619,7 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt, ins = &fn->leaf; -for (iter = fn->leaf; iter; iter=iter->u.dst.rt6_next) { +for (iter = fn->leaf; iter; iter=iter->dst.rt6_next) {/* * Search for duplicates */
@@ -647,7 +647,7 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt,if (iter->rt6i_metric > rt->rt6i_metric)break ; - ins = &iter->u.dst.rt6_next; + ins = &iter->dst.rt6_next; }/* Reset round-robin state, if necessary */
@@ -658,7 +658,7 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt,* insert node */ - rt->u.dst.rt6_next = iter; + rt->dst.rt6_next = iter; *ins = rt; rt->rt6i_node = fn;atomic_inc (&rt->rt6i_ref);
@@ -799,7 +799,7 @@ out: atomic_inc(&pn->leaf->rt6i_ref); }#endif -dst_free (&rt->u.dst); +dst_free (&rt->dst); }return err;
@@ -810,7 +810,7 @@ out: st_failure:if (fn && !(fn->fn_flags & (RTN_RTINFO |RTN_ROOT )))fib6_repair_tree (info->nl_net, fn); -dst_free (&rt->u.dst); +dst_free (&rt->dst);return err;#endif }
@@ -1108,7 +1108,7 @@ static void fib6_del_route(struct fib6_node *fn, struct rt6_info **rtp,RT6_TRACE ("fib6_del_route\n" );/* Unlink it */ - *rtp = rt->u.dst.rt6_next; + *rtp = rt->dst.rt6_next; rt->rt6i_node =NULL ; net->ipv6.rt6_stats->fib_rt_entries--; net->ipv6.rt6_stats->fib_discarded_routes++;
@@ -1122,14 +1122,14 @@ static void fib6_del_route(struct fib6_node *fn, struct rt6_info **rtp,FOR_WALKERS (w) {if (w->state ==FWS_C && w->leaf == rt) {RT6_TRACE ("walker %p adjusted by delroute\n" , w); - w->leaf = rt->u.dst.rt6_next; + w->leaf = rt->dst.rt6_next;if (w->leaf ==NULL ) w->state =FWS_U ; } }read_unlock (&fib6_walker_lock); - rt->u.dst.rt6_next =NULL ; + rt->dst.rt6_next =NULL ;/* If it was last route, expunge its radix tree node */ if (fn->leaf ==NULL ) {
@@ -1168,7 +1168,7 @@ int fib6_del(struct rt6_info *rt, struct nl_info *info)struct rt6_info **rtp;#if RT6_DEBUG >=2 -if (rt->u.dst.obsolete>0 ) { +if (rt->dst.obsolete>0 ) {WARN_ON (fn !=NULL );return -ENOENT ; }
@@ -1195,7 +1195,7 @@ int fib6_del(struct rt6_info *rt, struct nl_info *info)* Walk the leaf entries looking for ourself */ -for (rtp = &fn->leaf; *rtp; rtp = &(*rtp)->u.dst.rt6_next) { +for (rtp = &fn->leaf; *rtp; rtp = &(*rtp)->dst.rt6_next) {if (*rtp == rt) {fib6_del_route (fn, rtp, info);return 0 ;
@@ -1334,7 +1334,7 @@ static int fib6_clean_node(struct fib6_walker_t *w) .nl_net = c->net, }; -for (rt = w->leaf; rt; rt = rt->u.dst.rt6_next) { +for (rt = w->leaf; rt; rt = rt->dst.rt6_next) { res = c->func (rt, c->arg);if (res <0 ) { w->leaf = rt;
@@ -1448,8 +1448,8 @@ static int fib6_age(struct rt6_info *rt, void *arg) } gc_args.more++; }else if (rt->rt6i_flags &RTF_CACHE ) { -if (atomic_read (&rt->u.dst.__refcnt) ==0 && -time_after_eq (now, rt->u.dst.lastuse + gc_args.timeout)) { +if (atomic_read (&rt->dst.__refcnt) ==0 && +time_after_eq (now, rt->dst.lastuse + gc_args.timeout)) {RT6_TRACE ("aging clone %p\n" , rt);return -1 ; } else if ((rt->rt6i_flags & RTF_GATEWAY) &&
net/ipv6/ip6_output.c +19 -19
@@ -698,7 +698,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))ipv6_hdr (skb)->payload_len =htons (first_len -sizeof (struct ipv6hdr )); -dst_hold (&rt->u.dst); +dst_hold (&rt->dst);for (;;) {/* Prepare header of the next frame,
@@ -726,7 +726,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) err =output (skb);if (!err) -IP6_INC_STATS (net,ip6_dst_idev (&rt->u.dst), +IP6_INC_STATS (net,ip6_dst_idev (&rt->dst),IPSTATS_MIB_FRAGCREATES );if (err || !frag)
@@ -740,9 +740,9 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))kfree (tmp_hdr);if (err ==0 ) { -IP6_INC_STATS (net,ip6_dst_idev (&rt->u.dst), +IP6_INC_STATS (net,ip6_dst_idev (&rt->dst),IPSTATS_MIB_FRAGOKS ); -dst_release (&rt->u.dst); +dst_release (&rt->dst);return 0 ; }
@@ -752,9 +752,9 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *)) frag = skb; } -IP6_INC_STATS (net,ip6_dst_idev (&rt->u.dst), +IP6_INC_STATS (net,ip6_dst_idev (&rt->dst),IPSTATS_MIB_FRAGFAILS ); -dst_release (&rt->u.dst); +dst_release (&rt->dst);return err; }
@@ -785,7 +785,7 @@ slow_path:* Allocate buffer. */ -if ((frag =alloc_skb (len+hlen+sizeof (struct frag_hdr )+LL_ALLOCATED_SPACE (rt->u.dst.dev),GFP_ATOMIC )) ==NULL ) { +if ((frag =alloc_skb (len+hlen+sizeof (struct frag_hdr )+LL_ALLOCATED_SPACE (rt->dst.dev),GFP_ATOMIC )) ==NULL ) {NETDEBUG (KERN_INFO "IPv6: frag: no memory for new fragment!\n" );IP6_INC_STATS (net,ip6_dst_idev (skb_dst (skb)),IPSTATS_MIB_FRAGFAILS );
@@ -798,7 +798,7 @@ slow_path:*/ ip6_copy_metadata (frag, skb); -skb_reserve (frag,LL_RESERVED_SPACE (rt->u.dst.dev)); +skb_reserve (frag,LL_RESERVED_SPACE (rt->dst.dev));skb_put (frag, len + hlen +sizeof (struct frag_hdr ));skb_reset_network_header (frag); fh = (struct frag_hdr *)(skb_network_header (frag) + hlen);
@@ -1156,24 +1156,24 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to,/* need source address above miyazawa*/ } -dst_hold (&rt->u.dst); - inet->cork.dst = &rt->u.dst; +dst_hold (&rt->dst); + inet->cork.dst = &rt->dst; inet->cork.fl = *fl; np->cork.hop_limit = hlimit; np->cork.tclass = tclass; mtu = np->pmtudisc ==IPV6_PMTUDISC_PROBE ? - rt->u.dst.dev->mtu :dst_mtu (rt->u.dst.path); + rt->dst.dev->mtu :dst_mtu (rt->dst.path);if (np->frag_size < mtu) {if (np->frag_size) mtu = np->frag_size; } inet->cork.fragsize = mtu; -if (dst_allfrag (rt->u.dst.path)) +if (dst_allfrag (rt->dst.path)) inet->cork.flags |=IPCORK_ALLFRAG ; inet->cork.length =0 ; sk->sk_sndmsg_page =NULL ; sk->sk_sndmsg_off =0 ; - exthdrlen = rt->u.dst.header_len + (opt ? opt->opt_flen :0 ) - + exthdrlen = rt->dst.header_len + (opt ? opt->opt_flen :0 ) - rt->rt6i_nfheader_len; length += exthdrlen; transhdrlen += exthdrlen;
@@ -1186,7 +1186,7 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, mtu = inet->cork.fragsize; } - hh_len =LL_RESERVED_SPACE (rt->u.dst.dev); + hh_len =LL_RESERVED_SPACE (rt->dst.dev); fragheaderlen =sizeof (struct ipv6hdr ) + rt->rt6i_nfheader_len + (opt ? opt->opt_nflen :0 );
@@ -1224,7 +1224,7 @@ int ip6_append_data(struct sock *sk, int getfrag(void *from, char *to, }if (proto ==IPPROTO_UDP && - (rt->u.dst.dev->features &NETIF_F_UFO )) { + (rt->dst.dev->features &NETIF_F_UFO )) { err = ip6_ufo_append_data(sk, getfrag, from, length, hh_len, fragheaderlen,
@@ -1270,7 +1270,7 @@ alloc_new_skb: fraglen = datalen + fragheaderlen;if ((flags &MSG_MORE ) && - !(rt->u.dst.dev->features&NETIF_F_SG )) + !(rt->dst.dev->features&NETIF_F_SG )) alloclen = mtu;else alloclen = datalen + fragheaderlen;
@@ -1281,7 +1281,7 @@ alloc_new_skb:* because we have no idea if we're the last one. */ if (datalen == length + fraggap) - alloclen += rt->u.dst.trailer_len; + alloclen += rt->dst.trailer_len;/* * We just reserve space for fragment header.
@@ -1358,7 +1358,7 @@ alloc_new_skb:if (copy > length) copy = length; -if (!(rt->u.dst.dev->features&NETIF_F_SG )) { +if (!(rt->dst.dev->features&NETIF_F_SG )) {unsigned int off; off = skb->len;
@@ -1503,7 +1503,7 @@ int ip6_push_pending_frames(struct sock *sk) skb->priority = sk->sk_priority; skb->mark = sk->sk_mark; -skb_dst_set (skb,dst_clone (&rt->u.dst)); +skb_dst_set (skb,dst_clone (&rt->dst));IP6_UPD_PO_STATS (net, rt->rt6i_idev,IPSTATS_MIB_OUT , skb->len);if (proto ==IPPROTO_ICMPV6 ) {struct inet6_dev *idev =ip6_dst_idev (skb_dst (skb));
net/ipv6/ip6_tunnel.c +4 -4
@@ -552,7 +552,7 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,if (ip_route_output_key (dev_net (skb->dev), &rt, &fl)) goto out; - skb2->dev = rt->u.dst.dev; + skb2->dev = rt->dst.dev;/* route "incoming" packet */ if (rt->rt_flags &RTCF_LOCAL ) {
@@ -562,7 +562,7 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, fl.fl4_src = eiph->saddr; fl.fl4_tos = eiph->tos;if (ip_route_output_key (dev_net (skb->dev), &rt, &fl) || - rt->u.dst.dev->type !=ARPHRD_TUNNEL ) { + rt->dst.dev->type !=ARPHRD_TUNNEL ) {ip_rt_put (rt); goto out; }
@@ -626,7 +626,7 @@ ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,icmpv6_send (skb2, rel_type, rel_code, rel_info);if (rt) -dst_release (&rt->u.dst); +dst_release (&rt->dst);kfree_skb (skb2); }
@@ -1139,7 +1139,7 @@ static void ip6_tnl_link_config(struct ip6_tnl *t)if (dev->mtu <IPV6_MIN_MTU ) dev->mtu =IPV6_MIN_MTU ; } -dst_release (&rt->u.dst); +dst_release (&rt->dst); } }
net/ipv6/mcast.c +2 -2
@@ -158,7 +158,7 @@ int ipv6_sock_mc_join(struct sock *sk, int ifindex, const struct in6_addr *addr)if (rt) { dev = rt->rt6i_dev;dev_hold (dev); -dst_release (&rt->u.dst); +dst_release (&rt->dst); } }else dev =dev_get_by_index (net, ifindex);
@@ -248,7 +248,7 @@ static struct inet6_dev *ip6_mc_find_dev(struct net *net,if (rt) { dev = rt->rt6i_dev;dev_hold (dev); -dst_release (&rt->u.dst); +dst_release (&rt->dst); } }else dev =dev_get_by_index (net, ifindex);
net/ipv6/ndisc.c +4 -4
@@ -1231,7 +1231,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)ND_PRINTK0 (KERN_ERR "ICMPv6 RA: %s() got default router without neighbour.\n" , __func__); -dst_release (&rt->u.dst); +dst_release (&rt->dst);in6_dev_put (in6_dev);return ; }
@@ -1246,7 +1246,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)if (ra_msg->icmph.icmp6_hop_limit) { in6_dev->cnf.hop_limit = ra_msg->icmph.icmp6_hop_limit;if (rt) - rt->u.dst.metrics[RTAX_HOPLIMIT -1 ] = ra_msg->icmph.icmp6_hop_limit; + rt->dst.metrics[RTAX_HOPLIMIT -1 ] = ra_msg->icmph.icmp6_hop_limit; } skip_defrtr:
@@ -1365,7 +1365,7 @@ skip_linkparms: in6_dev->cnf.mtu6 = mtu;if (rt) - rt->u.dst.metrics[RTAX_MTU -1 ] = mtu; + rt->dst.metrics[RTAX_MTU -1 ] = mtu;rt6_mtu_change (skb->dev, mtu); }
@@ -1386,7 +1386,7 @@ skip_linkparms: } out:if (rt) -dst_release (&rt->u.dst); +dst_release (&rt->dst);else if (neigh)neigh_release (neigh);in6_dev_put (in6_dev);
net/ipv6/raw.c +6 -6
@@ -610,23 +610,23 @@ static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,struct sk_buff *skb;int err; -if (length > rt->u.dst.dev->mtu) { -ipv6_local_error (sk,EMSGSIZE , fl, rt->u.dst.dev->mtu); +if (length > rt->dst.dev->mtu) { +ipv6_local_error (sk,EMSGSIZE , fl, rt->dst.dev->mtu);return -EMSGSIZE ; }if (flags&MSG_PROBE ) goto out; skb =sock_alloc_send_skb (sk, - length +LL_ALLOCATED_SPACE (rt->u.dst.dev) +15 , + length +LL_ALLOCATED_SPACE (rt->dst.dev) +15 , flags &MSG_DONTWAIT , &err);if (skb ==NULL ) goto error; -skb_reserve (skb,LL_RESERVED_SPACE (rt->u.dst.dev)); +skb_reserve (skb,LL_RESERVED_SPACE (rt->dst.dev)); skb->priority = sk->sk_priority; skb->mark = sk->sk_mark; -skb_dst_set (skb,dst_clone (&rt->u.dst)); +skb_dst_set (skb,dst_clone (&rt->dst));skb_put (skb, length);skb_reset_network_header (skb);
@@ -641,7 +641,7 @@ static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,IP6_UPD_PO_STATS (sock_net (sk), rt->rt6i_idev,IPSTATS_MIB_OUT , skb->len); err =NF_HOOK (NFPROTO_IPV6 ,NF_INET_LOCAL_OUT , skb,NULL , - rt->u.dst.dev, dst_output); + rt->dst.dev, dst_output);if (err >0 ) err =net_xmit_errno (err);if (err)
net/ipv6/route.c +147 -153
289 lines not on this page · raw message
net/netfilter/ipvs/ip_vs_xmit.c +43 -43
86 lines not on this page · raw message
net/netfilter/nf_conntrack_netbios_ns.c +1 -1
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Quoted 6 lines · Changli Gao
remove useless union keyword in rtable,
rt6_infoanddn_route.Since there is only one member in a union, the union keyword isn't useful.
Signed-off-by Changli Gao <[email protected]>----
From: Changli Gao <[email protected]>
Date: Mon, 17 May 2010 12:38:28 +0800
Quoted 5 lines
remove useless union keyword in rtable,
rt6_infoanddn_route.Since there is only one member in a union, the union keyword isn't useful.
Signed-off-by Changli Gao <[email protected]>
Applied, thank you.