diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
| commit | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (patch) | |
| tree | 88bb1fcf84f9ebfa4299c9a8dcd9e6330b358446 /net/tipc/discover.c | |
| parent | 712d6954e3998d0de2840d8130941e8042541246 (diff) | |
| parent | 82a28c794f27aac17d7a3ebd7f14d731a11a5532 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'net/tipc/discover.c')
| -rw-r--r-- | net/tipc/discover.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/discover.c b/net/tipc/discover.c index 1657f0e795ff..74b7d1e28aec 100644 --- a/net/tipc/discover.c +++ b/net/tipc/discover.c | |||
| @@ -193,7 +193,7 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct bearer *b_ptr) | |||
| 193 | /* Always accept link here */ | 193 | /* Always accept link here */ |
| 194 | struct sk_buff *rbuf; | 194 | struct sk_buff *rbuf; |
| 195 | struct tipc_media_addr *addr; | 195 | struct tipc_media_addr *addr; |
| 196 | struct node *n_ptr = tipc_node_find(orig); | 196 | struct tipc_node *n_ptr = tipc_node_find(orig); |
| 197 | int link_fully_up; | 197 | int link_fully_up; |
| 198 | 198 | ||
| 199 | dbg(" in own cluster\n"); | 199 | dbg(" in own cluster\n"); |