The patch titled
net/decnet/: cleanups
has been removed from the -mm tree. Its filename is
net-decnet-cleanups.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: net/decnet/: cleanups
From: Adrian Bunk <bunk@xxxxxxxxx>
- make the following needlessly global functions static:
- dn_fib.c: dn_fib_sync_down()
- dn_fib.c: dn_fib_sync_up()
- dn_rules.c: dn_fib_rule_action()
- remove the following unneeded prototype:
- dn_fib.c: dn_cache_dump()
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/net/dn_fib.h | 3 ---
net/decnet/dn_fib.c | 9 +++++----
net/decnet/dn_rules.c | 4 ++--
3 files changed, 7 insertions(+), 9 deletions(-)
diff -puN include/net/dn_fib.h~net-decnet-cleanups include/net/dn_fib.h
--- a/include/net/dn_fib.h~net-decnet-cleanups
+++ a/include/net/dn_fib.h
@@ -131,9 +131,6 @@ extern __le16 dn_fib_get_attr16(struct r
extern void dn_fib_flush(void);
extern void dn_fib_select_multipath(const struct flowi *fl,
struct dn_fib_res *res);
-extern int dn_fib_sync_down(__le16 local, struct net_device *dev,
- int force);
-extern int dn_fib_sync_up(struct net_device *dev);
/*
* dn_tables.c
diff -puN net/decnet/dn_fib.c~net-decnet-cleanups net/decnet/dn_fib.c
--- a/net/decnet/dn_fib.c~net-decnet-cleanups
+++ a/net/decnet/dn_fib.c
@@ -55,8 +55,6 @@
#define endfor_nexthops(fi) }
-extern int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb);
-
static DEFINE_SPINLOCK(dn_fib_multipath_lock);
static struct dn_fib_info *dn_fib_info_list;
static DEFINE_SPINLOCK(dn_fib_info_lock);
@@ -80,6 +78,9 @@ static struct
[RTN_XRESOLVE] = { .error = -EINVAL, .scope = RT_SCOPE_NOWHERE },
};
+static int dn_fib_sync_down(__le16 local, struct net_device *dev, int force);
+static int dn_fib_sync_up(struct net_device *dev);
+
void dn_fib_free_info(struct dn_fib_info *fi)
{
if (fi->fib_dead == 0) {
@@ -651,7 +652,7 @@ static int dn_fib_dnaddr_event(struct no
return NOTIFY_DONE;
}
-int dn_fib_sync_down(__le16 local, struct net_device *dev, int force)
+static int dn_fib_sync_down(__le16 local, struct net_device *dev, int force)
{
int ret = 0;
int scope = RT_SCOPE_NOWHERE;
@@ -695,7 +696,7 @@ int dn_fib_sync_down(__le16 local, struc
}
-int dn_fib_sync_up(struct net_device *dev)
+static int dn_fib_sync_up(struct net_device *dev)
{
int ret = 0;
diff -puN net/decnet/dn_rules.c~net-decnet-cleanups net/decnet/dn_rules.c
--- a/net/decnet/dn_rules.c~net-decnet-cleanups
+++ a/net/decnet/dn_rules.c
@@ -75,8 +75,8 @@ int dn_fib_lookup(struct flowi *flp, str
return err;
}
-int dn_fib_rule_action(struct fib_rule *rule, struct flowi *flp, int flags,
- struct fib_lookup_arg *arg)
+static int dn_fib_rule_action(struct fib_rule *rule, struct flowi *flp,
+ int flags, struct fib_lookup_arg *arg)
{
int err = -EAGAIN;
struct dn_fib_table *tbl;
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
git-cpufreq.patch
git-drm.patch
git-dvb.patch
git-gfs2.patch
the-scheduled-removal-of-drivers-ieee1394-sbp2cforce_inquiry_hack.patch
git-input.patch
git-libata-all.patch
git-mtd.patch
git-net.patch
fs-nfs-make-code-static.patch
git-pcmcia.patch
include-scsi-libsash-should-include-linux-scatterlisth.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
git-scsi-misc.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
drivers-scsi-advansysc-cleanups.patch
make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
git-cryptodev.patch
mm-make-functions-static.patch
acx1xx-wireless-driver.patch
add-force-of-use-mmconfig.patch
drivers-edac-make-code-static.patch
inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix.patch
reiserfs-warn-about-the-useless-nolargeio-option.patch
x86-microcode-add-sysfs-and-hotplug-support-fix-fix-2.patch
drivers-char-scx200_gpioc-make-code-static.patch
drivers-char-pc8736x_gpioc-remove-unused-static-functions.patch
kernel-time-ntpc-possible-cleanups.patch
hdaps-unify-and-cache-hdaps-readouts-fix.patch
generic-ioremap_page_range-i386-conversion-fix.patch
fs-ecryptfs-possible-cleanups.patch
ecryptfs-add-a-maintainers-entry.patch
make-kernel-sysctlc_proc_do_string-static.patch
namespaces-utsname-sysctl-hack-fix.patch
namespaces-utsname-implement-clone_newuts-flag.patch
fs-reiser4-possible-cleanups.patch
drivers-ide-cleanups.patch
md-the-scheduled-removal-of-the-start_array-ioctl-for-md.patch
srcu-3-add-srcu-operations-to-rcutorture-fix.patch
the-scheduled-removal-of-some-oss-drivers.patch
the-scheduled-removal-of-some-oss-drivers-fix.patch
the-scheduled-removal-of-some-oss-drivers-fix-fix.patch
kill-sound-oss-_symsc.patch
schedule-obsolete-oss-drivers-for-removal-2nd-round.patch
slab-cache-shrinker-statistics.patch
debug-shared-irqs-kconfig-fix.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
