Merge branches 'acpica' and 'acpi-scan'

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

diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index d0c79cc..bc00231 100644 (file)
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
@@ -119,7 +119,8 @@ struct tipc_media {
                        char *raw);
        u32 priority;
        u32 tolerance;
-       u32 window;
+       u32 min_win;
+       u32 max_win;
        u32 mtu;
        u32 type_id;
        u32 hwaddr_len;
@@ -158,7 +159,8 @@ struct tipc_bearer {
        struct packet_type pt;
        struct rcu_head rcu;
        u32 priority;
-       u32 window;
+       u32 min_win;
+       u32 max_win;
        u32 tolerance;
        u32 domain;
        u32 identity;