patch-2.3.14 linux/include/net/ip.h
Next file: linux/include/net/ip6_route.h
Previous file: linux/include/net/if_inet6.h
Back to the patch index
Back to the overall index
- Lines: 27
- Date:
Wed Aug 18 16:44:36 1999
- Orig file:
v2.3.13/linux/include/net/ip.h
- Orig date:
Tue Jun 22 14:42:42 1999
diff -u --recursive --new-file v2.3.13/linux/include/net/ip.h linux/include/net/ip.h
@@ -76,7 +76,7 @@
#define IP_FRAG_TIME (30 * HZ) /* fragment lifetime */
extern void ip_mc_dropsocket(struct sock *);
-extern void ip_mc_dropdevice(struct device *dev);
+extern void ip_mc_dropdevice(struct net_device *dev);
extern int ip_mc_procinfo(char *, char **, off_t, int, int);
/*
@@ -86,7 +86,7 @@
extern void ip_build_and_send_pkt(struct sk_buff *skb, struct sock *sk,
u32 saddr, u32 daddr,
struct ip_options *opt);
-extern int ip_rcv(struct sk_buff *skb, struct device *dev,
+extern int ip_rcv(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt);
extern int ip_local_deliver(struct sk_buff *skb);
extern int ip_mr_input(struct sk_buff *skb);
@@ -139,7 +139,7 @@
extern __inline__ int ip_finish_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->dev = dev;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)