diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-24 16:49:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-24 16:49:10 -0700 |
| commit | 1897fe55e1385ddfb7733d0e0819588571cca867 (patch) | |
| tree | 672c324c49e0252da94d15ddd68d78d2df4da903 /net/tipc/bearer.h | |
| parent | cd5f3e2064ea21e1cbe140728a1b04e7d32f68eb (diff) | |
| parent | e4a0aee47e1823025972b8f3defde432e485b7b9 (diff) | |
| download | lwn-1897fe55e1385ddfb7733d0e0819588571cca867.tar.gz lwn-1897fe55e1385ddfb7733d0e0819588571cca867.zip | |
Merge branch 'tipc-Jun24-2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/net-next-2.6
Diffstat (limited to 'net/tipc/bearer.h')
| -rw-r--r-- | net/tipc/bearer.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h index 31d6172b20fd..5ad70eff1ebf 100644 --- a/net/tipc/bearer.h +++ b/net/tipc/bearer.h @@ -107,7 +107,6 @@ struct media { * @link_req: ptr to (optional) structure making periodic link setup requests * @links: list of non-congested links associated with bearer * @cong_links: list of congested links associated with bearer - * @continue_count: # of times bearer has resumed after congestion or blocking * @active: non-zero if bearer structure is represents a bearer * @net_plane: network plane ('A' through 'H') currently associated with bearer * @nodes: indicates which nodes in cluster can be reached through bearer @@ -129,7 +128,6 @@ struct tipc_bearer { struct link_req *link_req; struct list_head links; struct list_head cong_links; - u32 continue_count; int active; char net_plane; struct tipc_node_map nodes; |