Commit 0c147c6e authored by Hideaki Yoshifuji's avatar Hideaki Yoshifuji Committed by David S. Miller

[NET]: Convert dst->{input,output}() fully to dst_{input,output}().

parent baa04f2c
......@@ -122,7 +122,7 @@ static inline void dn_nsp_send(struct sk_buff *skb)
if ((dst = sk->dst_cache) && !dst->obsolete) {
try_again:
skb->dst = dst_clone(dst);
dst->output(skb);
dst_output(skb);
return;
}
......
......@@ -593,7 +593,7 @@ static __inline__ void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg,
* associations.
*/
skb->dst = dst_clone(dst);
skb->dst->output(skb);
dst_output(skb);
}
......
......@@ -389,7 +389,7 @@ static int dn_route_rx_packet(struct sk_buff *skb)
int err;
if ((err = dn_route_input(skb)) == 0)
return skb->dst->input(skb);
return dst_input(skb);
if (decnet_debug_level & 4) {
char *devname = skb->dev ? skb->dev->name : "???";
......
......@@ -184,14 +184,6 @@ static void igmp_mod_timer(struct ip_mc_list *im, int max_delay)
#define IGMP_SIZE (sizeof(struct igmphdr)+sizeof(struct iphdr)+4)
/* Don't just hand NF_HOOK skb->dst->output, in case netfilter hook
changes route */
static inline int
output_maybe_reroute(struct sk_buff *skb)
{
return skb->dst->output(skb);
}
static int igmp_send_report(struct net_device *dev, u32 group, int type)
{
struct sk_buff *skb;
......@@ -255,7 +247,7 @@ static int igmp_send_report(struct net_device *dev, u32 group, int type)
ih->csum=ip_compute_csum((void *)ih, sizeof(struct igmphdr));
return NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, rt->u.dst.dev,
output_maybe_reroute);
dst_output);
}
......
......@@ -344,7 +344,7 @@ static inline int ip_rcv_finish(struct sk_buff *skb)
}
}
return skb->dst->input(skb);
return dst_input(skb);
inhdr_error:
IP_INC_STATS_BH(IpInHdrErrors);
......
......@@ -1112,9 +1112,9 @@ static inline int ipmr_forward_finish(struct sk_buff *skb)
struct dst_entry *dst = skb->dst;
if (skb->len <= dst_pmtu(dst))
return dst->output(skb);
return dst_output(skb);
else
return ip_fragment(skb, dst->output);
return ip_fragment(skb, dst_output);
}
/*
......
......@@ -288,7 +288,7 @@ static int ipv6_routing_header(struct sk_buff **skb_ptr, int nhoff)
dst_release(xchg(&skb->dst, NULL));
ip6_route_input(skb);
if (skb->dst->error) {
skb->dst->input(skb);
dst_input(skb);
return -1;
}
if (skb->dst->dev->flags&IFF_LOOPBACK) {
......@@ -302,7 +302,7 @@ static int ipv6_routing_header(struct sk_buff **skb_ptr, int nhoff)
goto looped_back;
}
skb->dst->input(skb);
dst_input(skb);
return -1;
}
......
......@@ -47,7 +47,7 @@ static inline int ip6_rcv_finish( struct sk_buff *skb)
if (skb->dst == NULL)
ip6_route_input(skb);
return skb->dst->input(skb);
return dst_input(skb);
}
int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt)
......@@ -235,7 +235,7 @@ int ip6_mc_input(struct sk_buff *skb)
skb2 = skb;
}
dst->output(skb2);
dst_output(skb2);
}
}
#endif
......
......@@ -174,7 +174,7 @@ static inline int ip6_maybe_reroute(struct sk_buff *skb)
}
}
#endif /* CONFIG_NETFILTER */
return skb->dst->output(skb);
return dst_output(skb);
}
/*
......@@ -722,7 +722,7 @@ int ip6_call_ra_chain(struct sk_buff *skb, int sel)
static inline int ip6_forward_finish(struct sk_buff *skb)
{
return skb->dst->output(skb);
return dst_output(skb);
}
int ip6_forward(struct sk_buff *skb)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment