diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /net/ipv4/ipmr.c | |
parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) |
Merge with Linux 2.3.32.
Diffstat (limited to 'net/ipv4/ipmr.c')
-rw-r--r-- | net/ipv4/ipmr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index b65d6f405..86393bfda 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -1576,7 +1576,7 @@ int ipmr_get_route(struct sk_buff *skb, struct rtmsg *rtm, int nowait) * The /proc interfaces to multicast routing /proc/ip_mr_cache /proc/ip_mr_vif */ -int ipmr_vif_info(char *buffer, char **start, off_t offset, int length, int dummy) +static int ipmr_vif_info(char *buffer, char **start, off_t offset, int length) { struct vif_device *vif; int len=0; @@ -1622,7 +1622,7 @@ int ipmr_vif_info(char *buffer, char **start, off_t offset, int length, int dumm return len; } -int ipmr_mfc_info(char *buffer, char **start, off_t offset, int length, int dummy) +static int ipmr_mfc_info(char *buffer, char **start, off_t offset, int length) { struct mfc_cache *mfc; int len=0; |