Merge tag 'arc-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[linux-2.6-microblaze.git] / net / tipc / bearer.c

diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index d7ec26b..34ca7b7 100644 (file)
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -311,7 +311,8 @@ static int tipc_enable_bearer(struct net *net, const char *name,
 
        b->identity = bearer_id;
        b->tolerance = m->tolerance;
-       b->window = m->window;
+       b->min_win = m->min_win;
+       b->max_win = m->max_win;
        b->domain = disc_domain;
        b->net_plane = bearer_id + 'A';
        b->priority = prio;
@@ -796,7 +797,7 @@ static int __tipc_nl_add_bearer(struct tipc_nl_msg *msg,
                goto prop_msg_full;
        if (nla_put_u32(msg->skb, TIPC_NLA_PROP_TOL, bearer->tolerance))
                goto prop_msg_full;
-       if (nla_put_u32(msg->skb, TIPC_NLA_PROP_WIN, bearer->window))
+       if (nla_put_u32(msg->skb, TIPC_NLA_PROP_WIN, bearer->max_win))
                goto prop_msg_full;
        if (bearer->media->type_id == TIPC_MEDIA_TYPE_UDP)
                if (nla_put_u32(msg->skb, TIPC_NLA_PROP_MTU, bearer->mtu))
@@ -1088,7 +1089,7 @@ int __tipc_nl_bearer_set(struct sk_buff *skb, struct genl_info *info)
                if (props[TIPC_NLA_PROP_PRIO])
                        b->priority = nla_get_u32(props[TIPC_NLA_PROP_PRIO]);
                if (props[TIPC_NLA_PROP_WIN])
-                       b->window = nla_get_u32(props[TIPC_NLA_PROP_WIN]);
+                       b->max_win = nla_get_u32(props[TIPC_NLA_PROP_WIN]);
                if (props[TIPC_NLA_PROP_MTU]) {
                        if (b->media->type_id != TIPC_MEDIA_TYPE_UDP)
                                return -EINVAL;
@@ -1142,7 +1143,7 @@ static int __tipc_nl_add_media(struct tipc_nl_msg *msg,
                goto prop_msg_full;
        if (nla_put_u32(msg->skb, TIPC_NLA_PROP_TOL, media->tolerance))
                goto prop_msg_full;
-       if (nla_put_u32(msg->skb, TIPC_NLA_PROP_WIN, media->window))
+       if (nla_put_u32(msg->skb, TIPC_NLA_PROP_WIN, media->max_win))
                goto prop_msg_full;
        if (media->type_id == TIPC_MEDIA_TYPE_UDP)
                if (nla_put_u32(msg->skb, TIPC_NLA_PROP_MTU, media->mtu))
@@ -1275,7 +1276,7 @@ int __tipc_nl_media_set(struct sk_buff *skb, struct genl_info *info)
                if (props[TIPC_NLA_PROP_PRIO])
                        m->priority = nla_get_u32(props[TIPC_NLA_PROP_PRIO]);
                if (props[TIPC_NLA_PROP_WIN])
-                       m->window = nla_get_u32(props[TIPC_NLA_PROP_WIN]);
+                       m->max_win = nla_get_u32(props[TIPC_NLA_PROP_WIN]);
                if (props[TIPC_NLA_PROP_MTU]) {
                        if (m->type_id != TIPC_MEDIA_TYPE_UDP)
                                return -EINVAL;