2 files changed, 5 insertions, 5 deletions

diff --git a/include/linux/ceph/decode.h b/include/linux/ceph/decode.h
index ce488d95be89..450384fe487c 100644
--- a/include/linux/ceph/decode.h
+++ b/include/linux/ceph/decode.h
@@ -221,7 +221,7 @@ static inline void ceph_encode_timespec64(struct ceph_timespec *tv,
 #define CEPH_ENTITY_ADDR_TYPE_NONE      0
 #define CEPH_ENTITY_ADDR_TYPE_LEGACY    __cpu_to_le32(1)
 
-static inline void ceph_encode_addr(struct ceph_entity_addr *a)
+static inline void ceph_encode_banner_addr(struct ceph_entity_addr *a)
 {
         __be16 ss_family = htons(a->in_addr.ss_family);
         a->in_addr.ss_family = *(__u16 *)&ss_family;
@@ -229,7 +229,7 @@ static inline void ceph_encode_addr(struct ceph_entity_addr *a)
         /* Banner addresses require TYPE_NONE */
         a->type = CEPH_ENTITY_ADDR_TYPE_NONE;
 }
-static inline void ceph_decode_addr(struct ceph_entity_addr *a)
+static inline void ceph_decode_banner_addr(struct ceph_entity_addr *a)
 {
         __be16 ss_family = *(__be16 *)&a->in_addr.ss_family;
         a->in_addr.ss_family = ntohs(ss_family);
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 0a3ef33cf7ac..0473d9a7b1f4 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -222,7 +222,7 @@ EXPORT_SYMBOL(ceph_pr_addr);
 static void encode_my_addr(struct ceph_messenger *msgr)
 {
         memcpy(&msgr->my_enc_addr, &msgr->inst.addr, sizeof(msgr->my_enc_addr));
-        ceph_encode_addr(&msgr->my_enc_addr);
+        ceph_encode_banner_addr(&msgr->my_enc_addr);
 }
 
 /*
@@ -1734,14 +1734,14 @@ static int read_partial_banner(struct ceph_connection *con)
         ret = read_partial(con, end, size, &con->actual_peer_addr);
         if (ret <= 0)
                 goto out;
-        ceph_decode_addr(&con->actual_peer_addr);
+        ceph_decode_banner_addr(&con->actual_peer_addr);
 
         size = sizeof (con->peer_addr_for_me);
         end += size;
         ret = read_partial(con, end, size, &con->peer_addr_for_me);
         if (ret <= 0)
                 goto out;
-        ceph_decode_addr(&con->peer_addr_for_me);
+        ceph_decode_banner_addr(&con->peer_addr_for_me);
 
 out:
         return ret;