summaryrefslogtreecommitdiffstats
path: root/net/tipc/eth_media.c
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2011-12-30 02:19:42 +0100
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-12-30 03:53:29 +0100
commit358a0d1c9edcf6ff041776d65cdc2bc59887ab9c (patch)
tree656650f418e5127062e8e69000afb067d1bf79b1 /net/tipc/eth_media.c
parentipv6: Kill rt6i_dev and rt6i_expires defines. (diff)
downloadlinux-358a0d1c9edcf6ff041776d65cdc2bc59887ab9c.tar.xz
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/eth_media.c')
-rw-r--r--net/tipc/eth_media.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index cd0a4b8b0ecf..527e3f0e165d 100644
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -56,7 +56,7 @@ struct eth_bearer {
struct work_struct cleanup;
};
-static struct media eth_media_info;
+static struct tipc_media eth_media_info;
static struct eth_bearer eth_bearers[MAX_ETH_BEARERS];
static int eth_started;
static struct notifier_block notifier;
@@ -340,7 +340,7 @@ static int eth_msg2addr(struct tipc_media_addr *a, char *msg_area)
* Ethernet media registration info
*/
-static struct media eth_media_info = {
+static struct tipc_media eth_media_info = {
.send_msg = send_msg,
.enable_bearer = enable_bearer,
.disable_bearer = disable_bearer,