patch-2.3.14 linux/net/ipv6/ip6_output.c

Next file: linux/net/ipv6/mcast.c
Previous file: linux/net/ipv6/ip6_input.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.13/linux/net/ipv6/ip6_output.c linux/net/ipv6/ip6_output.c
@@ -50,7 +50,7 @@
 int ip6_output(struct sk_buff *skb)
 {
 	struct dst_entry *dst = skb->dst;
-	struct device *dev = dst->dev;
+	struct net_device *dev = dst->dev;
 	struct hh_cache *hh = dst->hh;
 
 	skb->protocol = __constant_htons(ETH_P_IPV6);
@@ -168,7 +168,7 @@
  *	is for us performace critical)
  */
 
-int ip6_nd_hdr(struct sock *sk, struct sk_buff *skb, struct device *dev,
+int ip6_nd_hdr(struct sock *sk, struct sk_buff *skb, struct net_device *dev,
 	       struct in6_addr *saddr, struct in6_addr *daddr,
 	       int proto, int len)
 {
@@ -528,7 +528,7 @@
 	if (pktlength <= mtu) {
 		struct sk_buff *skb;
 		struct ipv6hdr *hdr;
-		struct device *dev = dst->dev;
+		struct net_device *dev = dst->dev;
 
 		skb = sock_alloc_send_skb(sk, pktlength + 15 +
 					  dev->hard_header_len, 0,

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