Messages in this thread Patch in this message | | | Date | Sat, 19 Oct 1996 18:58:18 +0100 (BST) | From | Peter Denison <> | Subject | [PATCH] A few Niggles fixed for 2.1.5 |
| |
Here's a patch to get rid of that pesky 'policies defined but not used' warning if you compile with IP_ACCT and not IP_FIREWALL, and it sorts out a few (rather more serious) warnings from drivers/char/rtc.c
There are further warnings in net/netlink.c due to the file_operations changes, but these are going to take a little thinking about, as the internals won't necessarily cope with longs. I'm looking at it....
Feel free to lambast me if I've done anything really stupid!
--- v2.1.5/linux/net/ipv4/ip_fw.c Fri Jul 5 22:44:34 1996 +++ linux/net/ipv4/ip_fw.c Sun Aug 11 11:11:13 1996 @@ -149,7 +149,9 @@ static struct ip_fw **chains[] = {&ip_fw_fwd_chain, &ip_fw_in_chain, &ip_fw_out_chain, &ip_acct_chain}; +#endif /* CONFIG_IP_ACCT || CONFIG_IP_FIREWALL */ +#ifdef CONFIG_IP_FIREWALL int ip_fw_fwd_policy=IP_FW_F_ACCEPT; int ip_fw_in_policy=IP_FW_F_ACCEPT; int ip_fw_out_policy=IP_FW_F_ACCEPT; --- v2.1.5/linux/drivers/char/rtc.c Fri Oct 18 18:16:36 1996 +++ linux/drivers/char/rtc.c Sat Oct 19 18:12:55 1996 @@ -66,11 +66,11 @@ static struct timer_list rtc_irq_timer; -static int rtc_lseek(struct inode *inode, struct file *file, off_t offset, - int origin); +static long long rtc_llseek(struct inode *inode, struct file *file, + loff_t offset, int origin); -static int rtc_read(struct inode *inode, struct file *file, - char *buf, int count); +static long rtc_read(struct inode *inode, struct file *file, + char *buf, unsigned long count); static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); @@ -133,13 +133,14 @@ * Now all the various file operations that we export. */ -static int rtc_lseek(struct inode *inode, struct file *file, off_t offset, - int origin) +static long long rtc_llseek(struct inode *inode, struct file *file, + loff_t offset, int origin) { return -ESPIPE; } -static int rtc_read(struct inode *inode, struct file *file, char *buf, int count) +static long rtc_read(struct inode *inode, struct file *file, char *buf, + unsigned long count) { struct wait_queue wait = { current, NULL }; int retval; @@ -507,7 +508,7 @@ */ static struct file_operations rtc_fops = { - rtc_lseek, + rtc_llseek, rtc_read, NULL, /* No write */ NULL, /* No readdir */
-- Peter Denison <peterd@pnd-pc.demon.co.uk> Currently (still) working on a driver for Promise cards under Linux.
| |