Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 34475
b: refs/heads/master
c: 2aa7f36
h: refs/heads/master
i:
  34473: 4b50649
  34471: ca1f1c6
v: v3
  • Loading branch information
Adrian Bunk authored and David S. Miller committed Sep 22, 2006
1 parent b3dc316 commit dbffeec
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 50da859d4e566fba90ebda87b843970d902c903e
refs/heads/master: 2aa7f36cdb332a32849afbf25fcbf35dce5b1940
3 changes: 0 additions & 3 deletions trunk/include/net/dn_fib.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,6 @@ extern __le16 dn_fib_get_attr16(struct rtattr *attr, int attrlen, int type);
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
Expand Down
9 changes: 5 additions & 4 deletions trunk/net/decnet/dn_fib.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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) {
Expand Down Expand Up @@ -651,7 +652,7 @@ static int dn_fib_dnaddr_event(struct notifier_block *this, unsigned long event,
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;
Expand Down Expand Up @@ -695,7 +696,7 @@ int dn_fib_sync_down(__le16 local, struct net_device *dev, int force)
}


int dn_fib_sync_up(struct net_device *dev)
static int dn_fib_sync_up(struct net_device *dev)
{
int ret = 0;

Expand Down
4 changes: 2 additions & 2 deletions trunk/net/decnet/dn_rules.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ int dn_fib_lookup(struct flowi *flp, struct dn_fib_res *res)
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;
Expand Down

0 comments on commit dbffeec

Please sign in to comment.