diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /net/802/hippi.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'net/802/hippi.c')
| -rw-r--r-- | net/802/hippi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/802/hippi.c b/net/802/hippi.c index f1dd1dd17..daaea997c 100644 --- a/net/802/hippi.c +++ b/net/802/hippi.c @@ -57,7 +57,7 @@ void hippi_net_init(void) * daddr=NULL means leave destination address (eg unresolved arp) */ -int hippi_header(struct sk_buff *skb, struct device *dev, +int hippi_header(struct sk_buff *skb, struct net_device *dev, unsigned short type, void *daddr, void *saddr, unsigned len) { @@ -133,7 +133,7 @@ int hippi_rebuild_header(struct sk_buff *skb) * Determine the packet's protocol ID. */ -unsigned short hippi_type_trans(struct sk_buff *skb, struct device *dev) +unsigned short hippi_type_trans(struct sk_buff *skb, struct net_device *dev) { struct hippi_hdr *hip; |