patch-2.3.14 linux/net/ipv4/ip_output.c

Next file: linux/net/ipv4/ip_sockglue.c
Previous file: linux/net/ipv4/ip_masq_user.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.13/linux/net/ipv4/ip_output.c linux/net/ipv4/ip_output.c
@@ -101,7 +101,7 @@
 {
 	struct rtable *rt = (struct rtable *)skb->dst;
 	struct iphdr *iph;
-	struct device *dev;
+	struct net_device *dev;
 	
 	/* Build the IP header. */
 	if (opt)
@@ -159,7 +159,7 @@
 {
 	struct sock *sk = skb->sk;
 	struct rtable *rt = (struct rtable*)skb->dst;
-	struct device *dev = rt->u.dst.dev;
+	struct net_device *dev = rt->u.dst.dev;
 
 	/*
 	 *	If the indicated interface is up and running, send the packet.
@@ -236,7 +236,7 @@
 	struct sock *sk = skb->sk;
 	struct ip_options *opt = sk->opt;
 	struct rtable *rt;
-	struct device *dev;
+	struct net_device *dev;
 	struct iphdr *iph;
 	unsigned int tot_len;
 
@@ -728,7 +728,7 @@
 	struct iphdr *iph;
 	unsigned char *raw;
 	unsigned char *ptr;
-	struct device *dev;
+	struct net_device *dev;
 	struct sk_buff *skb2;
 	unsigned int mtu, hlen, left, len; 
 	int offset;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)