Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 90045
b: refs/heads/master
c: 0e0609b
h: refs/heads/master
i:
  90043: f2e5751
v: v3
  • Loading branch information
Allan Stephens authored and David S. Miller committed Mar 6, 2008
1 parent 7eab93d commit ea3583c
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 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: e247a8f5d018740220c66bd5df1928d21d277d63
refs/heads/master: 0e0609bbd2ab39a5964a70b409a5567ebbaf3700
9 changes: 9 additions & 0 deletions trunk/include/net/tipc/tipc_bearer.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ struct tipc_bearer {
char name[TIPC_MAX_BEARER_NAME];
};

/*
* TIPC routines available to supported media types
*/

int tipc_register_media(u32 media_type,
char *media_name,
Expand All @@ -123,6 +126,12 @@ void tipc_continue(struct tipc_bearer *tb_ptr);
int tipc_enable_bearer(const char *bearer_name, u32 bcast_scope, u32 priority);
int tipc_disable_bearer(const char *name);

/*
* Routines made available to TIPC by supported media types
*/

int tipc_eth_media_start(void);
void tipc_eth_media_stop(void);

#endif

Expand Down
8 changes: 0 additions & 8 deletions trunk/net/tipc/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,6 @@
#include "subscr.h"
#include "config.h"

int tipc_eth_media_start(void);
void tipc_eth_media_stop(void);
int tipc_handler_start(void);
void tipc_handler_stop(void);
int tipc_socket_init(void);
void tipc_socket_stop(void);
int tipc_netlink_start(void);
void tipc_netlink_stop(void);

#define TIPC_MOD_VER "1.6.2"

Expand Down
6 changes: 6 additions & 0 deletions trunk/net/tipc/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,12 @@ extern int tipc_core_start(void);
extern void tipc_core_stop(void);
extern int tipc_core_start_net(void);
extern void tipc_core_stop_net(void);
extern int tipc_handler_start(void);
extern void tipc_handler_stop(void);
extern int tipc_netlink_start(void);
extern void tipc_netlink_stop(void);
extern int tipc_socket_init(void);
extern void tipc_socket_stop(void);

static inline int delimit(int val, int min, int max)
{
Expand Down

0 comments on commit ea3583c

Please sign in to comment.