diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-12-29 20:19:42 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-12-29 21:53:29 -0500 |
| commit | 358a0d1c9edcf6ff041776d65cdc2bc59887ab9c (patch) | |
| tree | 656650f418e5127062e8e69000afb067d1bf79b1 /net/tipc/bearer.h | |
| parent | d191854282fd831da785a5a34bc6fd16049b8578 (diff) | |
| download | linux-358a0d1c9edcf6ff041776d65cdc2bc59887ab9c.tar.gz linux-358a0d1c9edcf6ff041776d65cdc2bc59887ab9c.tar.bz2 linux-358a0d1c9edcf6ff041776d65cdc2bc59887ab9c.zip | |
tipc: rename struct media to struct tipc_media
Give it a meaningful prefix, as suggested by DaveM, so that it
is consistent with things like struct tipc_bearer, and so it isn't
confused with anything else. This has no impact on the actual
runtime code behaviour.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc/bearer.h')
| -rw-r--r-- | net/tipc/bearer.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h index cfe77c4b20f9..af01ca23a6d7 100644 --- a/net/tipc/bearer.h +++ b/net/tipc/bearer.h @@ -74,7 +74,7 @@ struct tipc_media_addr { struct tipc_bearer; /** - * struct media - TIPC media information available to internal users + * struct tipc_media - TIPC media information available to internal users * @send_msg: routine which handles buffer transmission * @enable_bearer: routine which enables a bearer * @disable_bearer: routine which disables a bearer @@ -90,7 +90,7 @@ struct tipc_bearer; * @name: media name */ -struct media { +struct tipc_media { int (*send_msg)(struct sk_buff *buf, struct tipc_bearer *b_ptr, struct tipc_media_addr *dest); @@ -139,7 +139,7 @@ struct tipc_bearer { struct tipc_media_addr addr; /* initalized by media */ char name[TIPC_MAX_BEARER_NAME]; spinlock_t lock; - struct media *media; + struct tipc_media *media; u32 priority; u32 window; u32 tolerance; @@ -164,7 +164,7 @@ extern struct tipc_bearer tipc_bearers[]; /* * TIPC routines available to supported media types */ -int tipc_register_media(struct media *m_ptr); +int tipc_register_media(struct tipc_media *m_ptr); void tipc_recv_msg(struct sk_buff *buf, struct tipc_bearer *tb_ptr); @@ -191,7 +191,7 @@ void tipc_bearer_remove_dest(struct tipc_bearer *b_ptr, u32 dest); void tipc_bearer_schedule(struct tipc_bearer *b_ptr, struct link *l_ptr); struct tipc_bearer *tipc_bearer_find(const char *name); struct tipc_bearer *tipc_bearer_find_interface(const char *if_name); -struct media *tipc_media_find(const char *name); +struct tipc_media *tipc_media_find(const char *name); int tipc_bearer_resolve_congestion(struct tipc_bearer *b_ptr, struct link *l_ptr); int tipc_bearer_congested(struct tipc_bearer *b_ptr, struct link *l_ptr); void tipc_bearer_stop(void); |